Merge lp:~pconnell/entrails/2and3 into lp:entrails

[Phil Connell]

Updates to run on both Python 2 and 3.

Updates to run on both Python 2 and 3.

Approach is very simple: ran 2to3 over the code and added a few extra __future__ imports to make Python 2 work, i.e. most of the changes are auto-generated.

Background/Motivation:
  - Anything using twisted is stuck on Python 2, can't drop support yet.
  - Future tools (e.g. sextant) and most development without dependencies on twisted is all Python 3.
  - So, need to support both for forseeable future. Eventual goal is to drop Python 2 support.

[Martin Morrison (isoschiz)]

Didn't really review code; approach sounds reasonable. Sextant sounds exciting. ;-)

review: Approve

=== modified file 'src/entrails/_output.py'
--- src/entrails/_output.py	2014-07-07 08:59:06 +0000
+++ src/entrails/_output.py	2014-07-07 12:55:36 +0000
@@ -6,6 +6,8 @@
 # Copyright 2012, 2014, Ensoft Ltd.
 # -----------------------------------------------------------------------------
 
+from __future__ import absolute_import, print_function
+
 """Output generators."""
 
 __all__ = (
@@ -138,36 +140,36 @@
     Displays all output data with little formatting.
     """
     def __init__(self):
-        print "Entrails debug output started on {0}".format(
-            datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
+        print("Entrails debug output started on {0}".format(
+            datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")))
 
     def close(self):
-        print "Entrails debug output ended on {0}".format(
-            datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
+        print("Entrails debug output ended on {0}".format(
+            datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")))
 
     def enter(self, o):
-        print "FUNCTION CALL: " + o.call_string()
-        for k, v in o.iteritems():
-            print "\t{0}:{1}".format(k, str(v))
+        print("FUNCTION CALL: " + o.call_string())
+        for k, v in o.items():
+            print("\t{0}:{1}".format(k, str(v)))
         return None
 
     def exit(self, o):
-        print "FUNCTION EXIT"
-        for k, v in o.iteritems():
-            print "\t{0}:{1}".format(k, str(v))
+        print("FUNCTION EXIT")
+        for k, v in o.items():
+            print("\t{0}:{1}".format(k, str(v)))
         return None
 
     def exception(self, o):
-        print "EXCEPTION on line {0} in {1}".format(o["f_lineno"],
-                                                    o["co_filename"])
-        for k, v in o.iteritems():
-          print k + ": " + str(v)
+        print("EXCEPTION on line {0} in {1}".format(o["f_lineno"],
+                                                    o["co_filename"]))
+        for k, v in o.items():
+          print(k + ": " + str(v))
         return None
 
     def logging(self, o, event_type_string):
-        print "ERROR TRACING with event: {0} on line {1} in {2}".format(event_type_string,
+        print("ERROR TRACING with event: {0} on line {1} in {2}".format(event_type_string,
                                                                         o["f_lineno"],
-                                                                        o["co_filename"])
+                                                                        o["co_filename"]))
         return None
 
 
@@ -215,7 +217,7 @@
     def write_out(self, codeframe, event_type):
         event = ET.SubElement(self.root, "event")
         event.attrib = {"timestamp" : "{0:f}".format(codeframe["timestamp"])}
-        for k, v in codeframe.iteritems():
+        for k, v in codeframe.items():
             if k != "timestamp":
                 ET.SubElement(event, k).text = str(v)
         ET.SubElement(event, "type").text = event_type

=== modified file 'src/entrails/_trace.py'
--- src/entrails/_trace.py	2014-07-07 08:59:06 +0000
+++ src/entrails/_trace.py	2014-07-07 12:55:36 +0000
@@ -6,6 +6,8 @@
 # Copyright 2012, 2014, Ensoft Ltd.
 # -----------------------------------------------------------------------------
 
+from __future__ import absolute_import, print_function
+
 """Execution tracer."""
 
 __all__ = (
@@ -38,7 +40,7 @@
         """
         # We rely on CPython putting arguments at start of f_locals (in reverse
         #   order for some reason...).  This is undocumented, but consistent.
-        parameters = [(k, v) for k, v in self["f_locals"].iteritems()
+        parameters = [(k, v) for k, v in self["f_locals"].items()
                     if k in self["co_varnames"][0:self["co_argcount"]]]
         parameters.reverse()
         return collections.OrderedDict(parameters)
@@ -52,7 +54,7 @@
         """
         # Possibly chop off first self argument
         ignorer = 0 if not self.is_method() else 1
-        return self.parameters().values()[ignorer:]
+        return list(self.parameters().values())[ignorer:]
 
     def string_arguments(self):
         """
@@ -151,7 +153,7 @@
         try:
             # This is confusing.  We go into the previous (parent) frame and
             #   find the local variable name in that pointing to a our class.
-            for k, v in self['f_back'].f_locals.items():
+            for k, v in list(self['f_back'].f_locals.items()):
                 if v == self['f_locals']['self']:
                     return k
         except:

=== modified file 'src/trace.py'
--- src/trace.py	2014-07-07 08:59:06 +0000
+++ src/trace.py	2014-07-07 12:55:36 +0000
@@ -5,6 +5,8 @@
 # Created by Ben Eills
 # ----------------------------------------------------------------------------
 
+from __future__ import absolute_import, print_function
+
 """
 Convienience script to add/remove EnTrails tracing from a Python program.
 
@@ -45,21 +47,21 @@
     first=True
     for line in fileinput.input(filename, inplace=1, backup=".backup"):
         if first and line.startswith("#!/"):
-            print line,
+            print(line, end=' ')
             continue
         if first:
-            print MARKER
-            print "import entrails"
+            print(MARKER)
+            print("import entrails")
             if include_std_lib:
-                print "_entrails_t = entrails.Entrails(\"%s\", filters=())" % label
+                print("_entrails_t = entrails.Entrails(\"%s\", filters=())" % label)
             else:
-                print "_entrails_t = entrails.Entrails(\"%s\")" % label
-            print output_code_string
-            print "_entrails_t.add_output(_entrails_o)"
-            print "_entrails_t.start_trace()"
-            print ENDMARKER
+                print("_entrails_t = entrails.Entrails(\"%s\")" % label)
+            print(output_code_string)
+            print("_entrails_t.add_output(_entrails_o)")
+            print("_entrails_t.start_trace()")
+            print(ENDMARKER)
             first = False
-        print line,
+        print(line, end=' ')
     fileinput.close()
 
 
@@ -116,12 +118,12 @@
 
     if args.action == "add":
         if not already_modified(args.sourcefile):
-            print "Adding entrails code to " + args.sourcefile
-            print "Backing up file to " + args.sourcefile + ".backup"
+            print("Adding entrails code to " + args.sourcefile)
+            print("Backing up file to " + args.sourcefile + ".backup")
             insert_header(args.sourcefile, output_code_string, label, args.include_std_lib)
             insert_footer(args.sourcefile)
         else:
-            print "File already has entrails code.  Run with 'remove' option to remove code."
+            print("File already has entrails code.  Run with 'remove' option to remove code.")
 
     elif args.action == "remove":
         extra=False
@@ -129,13 +131,13 @@
             if line.startswith(MARKER):
                 extra = True
             if not extra:
-                print line,
+                print(line, end=' ')
             if line.startswith(ENDMARKER):
                 extra = False
         fileinput.close()
 
     else:
-        print "Invalid action: " + args.action[0]
+        print("Invalid action: " + args.action[0])
         parser.print_help()
 
 if __name__ == '__main__':