Bug 1559975: Fix python2/3 compat in gfx/ r=ahal

Differential Revision: https://phabricator.services.mozilla.com/D35337

gfx/angle/update-angle.py

@@ -1,4 +1,5 @@
 #! /usr/bin/env python3
+from __future__ import print_function
 assert __name__ == '__main__'
 
 '''
@@ -84,7 +85,7 @@
 # ------------------------------------------------------------------------------
 
 def run_checked(*args, **kwargs):
-    print(' ', args)
+    print((' ', args))
     sys.stdout.flush()
     return subprocess.run(args, check=True, **kwargs)
 
@@ -293,7 +294,7 @@ def gather_libraries(roots: Sequence[str], descs: dict) -> Set[str]:
     libraries = set()
     def fn(target_name):
         cur = descs[target_name]
-        print('  ' + cur['type'], target_name)
+        print(('  ' + cur['type'], target_name))
         assert has_all_includes(target_name, descs), target_name
 
         if cur['type'] in ('shared_library', 'static_library'):
@@ -308,7 +309,7 @@ def fn(target_name):
 libraries = gather_libraries(ROOTS, descs)
 print(f'\n{len(libraries)} libraries:')
 for k in libraries:
-    print(' ', k)
+    print((' ', k))
 
 if CHECK_ONLY:
     print('\n--check complete.')
@@ -570,7 +571,7 @@ def comment(x):
     # Write it out
 
     mozbuild = target_dir / 'moz.build'
-    print(' ', ' ', f'Writing {mozbuild}')
+    print((' ', ' ', f'Writing {mozbuild}'))
     data = b'\n'.join((x.encode() for x in lines))
     mozbuild.write_bytes(data)
 

gfx/angle/vendor_from_git.py

@@ -1,4 +1,5 @@
 #! /usr/bin/env python3
+from __future__ import print_function
 assert __name__ != '__main__'
 
 '''
@@ -16,12 +17,12 @@
 # --
 
 def print_now(*args):
-    print(*args)
+    print((*args))
     sys.stdout.flush()
 
 
 def run_checked(*args, **kwargs):
-    print(' ', args)
+    print((' ', args))
     sys.stdout.flush()
     return subprocess.run(args, check=True, **kwargs)
 

gfx/gl/GLParseRegistryXML.py

@@ -20,7 +20,7 @@
 ################################################################################
 
 # includes
-from __future__ import print_function
+from __future__ import absolute_import, print_function
 import os
 import sys
 import xml.etree.ElementTree

gfx/harfbuzz/src/gen-indic-table.py

@@ -245,7 +245,7 @@ def print_block (block, start, end, data):
 print ()
 print ("#undef _")
 for i in range (2):
-	print
+	print()
 	vv = sorted (values[i].keys ())
 	for v in vv:
 		print ("#undef %s_%s" %

gfx/layers/d3d11/genshaders.py

@@ -1,6 +1,7 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+from __future__ import absolute_import
 import argparse
 import codecs
 import locale

gfx/skia/generate_mozbuild.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+from __future__ import print_function
 import locale
 import subprocess
 from collections import defaultdict
@@ -428,7 +429,7 @@ def write_mozbuild(sources):
 
   f.close()
 
-  print 'Wrote ' + filename
+  print('Wrote ' + filename)
 
 def main():
   platform_sources = generate_platform_sources()

gfx/tests/marionette/test_pref_rollout_workaround.py

@@ -3,6 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import, print_function
 import platform
 from unittest import skipIf
 

gfx/thebes/gencjkcisvs.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import absolute_import
 import os.path
 import re
 import sys

gfx/wr/wrench/script/benchmark_server.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import print_function
 import json
 import os
 import subprocess

gfx/wr/wrench/script/headless.py

@@ -4,6 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import print_function
 import contextlib
 import os
 import subprocess

gfx/wr/wrench/script/reftest-debugger.py

@@ -4,6 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from __future__ import print_function
 import subprocess
 
 with open('reftest.log', "w") as out: