From 74dcc715d5bcae00dde9c9615f157f654e623408 Mon Sep 17 00:00:00 2001 From: Anthony King Date: Sat, 31 Oct 2015 15:06:38 -0400 Subject: py3: product_debug Change-Id: I4a1e25753a9addd199f148e7eec883b3d9ea337a --- tools/product_debug.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/product_debug.py b/tools/product_debug.py index ff2657c..891587f 100755 --- a/tools/product_debug.py +++ b/tools/product_debug.py @@ -14,10 +14,19 @@ # See the License for the specific language governing permissions and # limitations under the License. +from __future__ import print_function + import os import re import sys + +def iteritems(obj): + if hasattr('iteritems'): + return obj.iteritems() + return obj.items() + + def break_lines(key, val): # these don't get split if key in ("PRODUCT_MODEL"): @@ -42,7 +51,7 @@ def parse_variables(lines): def render_variables(variables): variables = dict(variables) del variables["FILE"] - variables = list(variables.iteritems()) + variables = list(variables.items()) variables.sort(lambda a, b: cmp(a[0], b[0])) return ("" + "\n".join([ "" % { "key": key, "val": val } @@ -104,7 +113,7 @@ def main(argv): "variables": render_variables(variables), "original": render_original(variables, original), }) - print """ + print(""" @@ -153,7 +162,7 @@ def main(argv): %(variables)s -""" % values +""" % values) if __name__ == "__main__": main(sys.argv) -- cgit v1.1
%(key)s%(val)s