1 files changed, 15 insertions, 7 deletions
diff --git a/tools/product_debug.py b/tools/product_debug.py
index ff2657c..1433a9a 100755
--- a/tools/product_debug.py
+++ b/tools/product_debug.py
@@ -14,13 +14,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
+from __future__ import print_function
+
+from operator import itemgetter
 import re
 import sys
 
+
+def iteritems(obj):
+  if hasattr(obj, 'iteritems'):
+    return obj.iteritems()
+  return obj.items()
+
+
 def break_lines(key, val):
   # these don't get split
-  if key in ("PRODUCT_MODEL"):
+  if key in ("PRODUCT_MODEL",):
     return (key,val)
   return (key, "\n".join(val.split()))
 
@@ -42,8 +51,7 @@ def parse_variables(lines):
 def render_variables(variables):
   variables = dict(variables)
   del variables["FILE"]
-  variables = list(variables.iteritems())
-  variables.sort(lambda a, b: cmp(a[0], b[0]))
+  variables = sorted(variables.items(), key=itemgetter(0))
   return ("<table id='variables'>"
       + "\n".join([ "<tr><th>%(key)s</th><td>%(val)s</td></tr>" % { "key": key, "val": val }
         for key,val in variables])
@@ -69,7 +77,7 @@ def render_original(variables, text):
   return text
 
 def read_file(fn):
-  f = file(fn)
+  f = open(fn)
   text = f.read()
   f.close()
   return text
@@ -104,7 +112,7 @@ def main(argv):
     "variables": render_variables(variables),
     "original": render_original(variables, original),
   })
-  print """<html>
+  print("""<html>
 
 
 <head>
@@ -153,7 +161,7 @@ def main(argv):
 %(variables)s
 </body>
 </html>
-""" % values
+""" % values)
 
 if __name__ == "__main__":
   main(sys.argv)