Merge pull request #2 from stephenworsley/py3-patch

Update for python 3

kapture/__main__.py

@@ -28,12 +28,12 @@ def main(command_args):
             time.sleep(interval)
             i += 1
     finally:
-        print 'Killing'
+        print('Killing')
         process.kill()
 
 
 def usage():
-    print 'usage: python -m kapture -h'
+    print('usage: python -m kapture -h')
     print('       python -m kapture [-l LOG]'
           ' (-c command | -m module-name | script) [args]')
     exit()

kapture/blockview.py

@@ -38,7 +38,9 @@ def parse_code(log, nlines=10):
 
 def read_log(log_path):
     my_locals = {}
-    execfile(log_path, globals(), my_locals)
+    with open(log_path) as log_file:
+        log = log_file.read()
+    exec(log, globals(), my_locals)
     return my_locals['log']
 
 
@@ -117,8 +119,8 @@ def _label(self, all_patches):
 
     def _onclick(self, event, debug=False):
         if debug:
-            print 'button=%d, x=%d, y=%d, xdata=%f, ydata=%f' % (
-                event.button, event.x, event.y, event.xdata, event.ydata)
+            print('button=%d, x=%d, y=%d, xdata=%f, ydata=%f' % (
+                event.button, event.x, event.y, event.xdata, event.ydata))
 
         #pop-up style
         props = dict(boxstyle='square', facecolor='white')

kapture/wrap_user.py

@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 import linecache
 import os.path
 import pdb
@@ -16,16 +18,20 @@
 class IntPdb(pdb.Pdb):
     def __init__(self, completekey='tab', stdin=None, stdout=None, skip=None):
         pdb.Pdb.__init__(self, completekey, stdin, stdout, skip)
+        self.nosigint = True
         self.allow_kbdint = False
         signal.signal(signal.SIGINT, self.sigint_handler)
 
     def sigint_handler(self, signum, frame):
         if self.allow_kbdint:
             raise KeyboardInterrupt
-        print >>self.stdout, "\nProgram interrupted. (Use 'cont' to resume)."
+        self.message("\nProgram interrupted. (Use 'cont' to resume).")
         self.set_step()
         self.set_trace(frame)
 
+    def message(self, msg):
+        print(msg, file=self.stdout)
+
     def logging_sigint_handler(self, signum, frame):
         stack, i = self.get_stack(sys._getframe().f_back, None)
         #print >>self.stdout, "------\n", stack, "------\n"
@@ -169,7 +175,7 @@ def tb_log():
 
 
 def usage():
-    print 'usage: wrap_user.py -h'
+    print('usage: wrap_user.py -h')
     print('       wrap_user.py [-l LOG] (-c command | -m module-name | script)'
           ' [args]')
     exit()
@@ -193,8 +199,8 @@ def usage():
             usage()
         command = sys.argv[2]
         sys.argv = ['-c'] + sys.argv[3:]
-        exec command in {'__doc__': None, '__name__': '__main__',
-                         '__package__': None}
+        exec(command, {'__doc__': None, '__name__': '__main__',
+                       '__package__': None})
     elif sys.argv[1] == '-m':
         if len(sys.argv) < 3:
             usage()