test:tutorial: add 0x05120005 to doctest

[hooke.git] / hooke / hooke.py

diff --git a/hooke/hooke.py b/hooke/hooke.py
index 6cf6245170ac011294a6fd1cbaf5145871fabb8b..e056433ffc694d8dde27dc52c9a684a291763fdc 100644 (file)
--- a/hooke/hooke.py
+++ b/hooke/hooke.py
@@ -1,22 +1,21 @@
 # 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.
 """
@@ -35,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
@@ -243,8 +242,8 @@ 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:
@@ -255,7 +254,7 @@ def main():
     runner = HookeRunner()
 
     if options.version == True:
-        print version()
+        print(version())
         sys.exit(0)
     if options.debug == True:
         hooke.config.set(