Convert from "print ..." to "print(...)"

[hooke.git] / hooke / hooke.py

diff --git a/hooke/hooke.py b/hooke/hooke.py
index b9a659e77397d191ed913939b0bcb816d86378c3..e056433ffc694d8dde27dc52c9a684a291763fdc 100644 (file)
--- a/hooke/hooke.py
+++ b/hooke/hooke.py
@@ -1,23 +1,21 @@
-# Copyright (C) 2008-2010 Fabrizio Benedetti
-#                         Massimo Sandal <devicerandom@gmail.com>
+# Copyright (C) 2008-2012 Massimo Sandal <devicerandom@gmail.com>
 #                         Rolf Schmidt <rschmidt@alcor.concordia.ca>
-#                         W. Trevor King <wking@drexel.edu>
+#                         W. Trevor King <wking@tremily.us>
 #
 # This file is part of Hooke.
 #
-# Hooke is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
+# Hooke is free software: you can redistribute it and/or modify it under the
+# terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
 #
-# Hooke is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
-# Public License for more details.
+# Hooke is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
 #
-# You should have received a copy of the GNU Lesser General Public
-# License along with Hooke.  If not, see
-# <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Lesser General Public License
+# along with Hooke.  If not, see <http://www.gnu.org/licenses/>.
 
 """Hooke - A force spectroscopy review & analysis tool.
 """
@@ -36,10 +34,10 @@ if False: # Queue pickle error debugging code
     feed = multiprocessing.queues.Queue._feed
     def new_feed (buffer, notempty, send, writelock, close):
         def s(obj):
-            print 'SEND:', obj, dir(obj)
+            print('SEND: {} {}'.format(obj, dir(obj)))
             for a in dir(obj):
                 attr = getattr(obj, a)
-                #print '  ', a, attr, type(attr)
+                #print('  {} {} {}'.format(a, attr, type(attr)))
             if obj.__class__.__name__ == 'Hooke':
                 # Set suspect attributes to None until you resolve the
                 # PicklingError.  Then fix whatever is breaking the
@@ -92,7 +90,7 @@ class Hooke (object):
         self.load_drivers()
         self.load_ui()
         self.engine = engine.CommandEngine()
-        self.playlists = playlist.NoteIndexList()
+        self.playlists = playlist.Playlists()
 
     def load_log(self):
         config_file = StringIO.StringIO()
@@ -101,6 +99,8 @@ class Hooke (object):
         # Don't attach the logger because it contains an unpicklable
         # thread.lock.  Instead, grab it directly every time you need it.
         #self.log = logging.getLogger('hooke')
+        log = logging.getLogger('hooke')
+        log.debug('config paths: %s' % self.config._config_paths)
 
     def load_plugins(self):
         self.plugins = plugin_mod.load_graph(
@@ -206,6 +206,9 @@ class HookeRunner (object):
             hooke = command_to_ui.get(block=True)
             log.debug('cleanup got %s instance' % type(hooke))
         command.join()
+        for playlist in hooke.playlists:  # Curve._hooke is not pickled.
+            for curve in playlist:
+                curve.set_hooke(hooke)
         return hooke
 
 
@@ -224,6 +227,12 @@ def main():
     p.add_option(
         '-p', '--persist', dest='persist', action='store_true', default=False,
         help="Don't exit after running a script or commands.")
+    p.add_option(
+        '-u', '--ui', dest='user_interface',
+        help="Override the configured user interface (for easy switching).")
+    p.add_option(
+        '--config', dest='config', metavar='FILE',
+        help="Override the default config file chain.")
     p.add_option(
         '--save-config', dest='save_config',
         action='store_true', default=False,
@@ -233,21 +242,30 @@ def main():
         help="Enable debug logging.")
     options,arguments = p.parse_args()
     if len(arguments) > 0:
-        print >> sys.stderr, 'More than 0 arguments to %s: %s' \
-            % (sys.argv[0], arguments)
+        sys.stderr.write('More than 0 arguments to {}: {}\n'.format(
+                sys.argv[0], arguments))
         p.print_help(sys.stderr)
         sys.exit(1)
+    if options.config != None:
+        config_mod.DEFAULT_PATHS = [
+            os.path.abspath(os.path.expanduser(options.config))]
 
     hooke = Hooke(debug=__debug__)
     runner = HookeRunner()
 
     if options.version == True:
-        print version()
+        print(version())
         sys.exit(0)
     if options.debug == True:
         hooke.config.set(
             section='handler_hand1', option='level', value='NOTSET')
         hooke.load_log()
+    if options.user_interface not in [None, hooke.ui.name]:
+        hooke.config.set(
+            ui.USER_INTERFACE_SETTING_SECTION, hooke.ui.name, False)
+        hooke.config.set(
+            ui.USER_INTERFACE_SETTING_SECTION, options.user_interface, True)
+        hooke.load_ui()
     if options.script != None:
         with open(os.path.expanduser(options.script), 'r') as f:
             options.commands.extend(f.readlines())