Migrate all Python hashbangs to Python 3 (#27838)

cbracken · web-flow · commit 9985bc081c68 · 2021-07-31T11:09:12.000-07:00
Migrates all `#!/usr/bin/env python` hashbang lines to use python3. Also updates the licence tool to treat python3 scripts on par with python 2 scripts. Issue: flutter/flutter#83043
diff --git a/build/copy_info_plist.py b/build/copy_info_plist.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
@@ -13,9 +13,9 @@
 usage: copy_info_plist.py <src_path> <dest_path> --bitcode=<enable_bitcode>
 """
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
+
+
+
 import subprocess
 
 import sys
diff --git a/build/dart/tools/dart_package_name.py b/build/dart/tools/dart_package_name.py
@@ -1,4 +1,5 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
+#
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
diff --git a/build/dart/tools/dart_pkg.py b/build/dart/tools/dart_pkg.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
@@ -81,7 +81,7 @@ def copy(from_root, to_root, filter_func=None):
         os.makedirs(to_dir)
       shutil.copy(from_path, to_path)
 
-    dirs[:] = filter(wrapped_filter, dirs)
+    dirs[:] = list(filter(wrapped_filter, dirs))
 
 
 def copy_or_link(from_root, to_root, filter_func=None):
@@ -114,7 +114,7 @@ def list_files(from_root, filter_func=None):
     for name in filter(wrapped_filter, files):
       path = os.path.join(root, name)
       file_list.append(path)
-    dirs[:] = filter(wrapped_filter, dirs)
+    dirs[:] = list(filter(wrapped_filter, dirs))
   return file_list
 
 
diff --git a/build/generate_coverage.py b/build/generate_coverage.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
@@ -84,7 +84,7 @@ def main():
 
     RemoveIfExists(raw_profile)
 
-    print "Running test %s to gather profile." % os.path.basename(absolute_test_path)
+    print("Running test %s to gather profile." % os.path.basename(absolute_test_path))
 
     test_command = [absolute_test_path]
 
diff --git a/build/git_revision.py b/build/git_revision.py
@@ -1,13 +1,13 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Get the Git HEAD revision of a specified Git repository."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
+
+
+
 
 import sys
 import subprocess
diff --git a/build/zip.py b/build/zip.py
@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+#
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
diff --git a/ci/firebase_testlab.py b/ci/firebase_testlab.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature
@@ -1,2 +1,2 @@
-Signature: 17e2c7f169a5804317b8f79ab1f8a838
+Signature: fdaf33383efb94fa6bbc158cbc25635c
 
diff --git a/shell/platform/fuchsia/flutter/build/asset_package.py b/shell/platform/fuchsia/flutter/build/asset_package.py
@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+#
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
diff --git a/shell/platform/fuchsia/flutter/build/gen_debug_wrapper_main.py b/shell/platform/fuchsia/flutter/build/gen_debug_wrapper_main.py
@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+#
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
diff --git a/sky/tools/create_ios_framework.py b/sky/tools/create_ios_framework.py
@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+#
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
diff --git a/sky/tools/create_macos_gen_snapshots.py b/sky/tools/create_macos_gen_snapshots.py
@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+#
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
diff --git a/sky/tools/create_xcframework.py b/sky/tools/create_xcframework.py
@@ -1,11 +1,12 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+#
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
+
+
+
 
 import argparse
 import errno
diff --git a/sky/tools/dist_dart_pkg.py b/sky/tools/dist_dart_pkg.py
@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+#
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
diff --git a/sky/tools/flutter_gdb b/sky/tools/flutter_gdb
@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+#
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
@@ -39,7 +40,7 @@ def _find_package_pid(adb_path, package):
     ps_output = subprocess.check_output([adb_path, 'shell', 'ps'])
     ps_match = re.search('^\S+\s+(\d+).*\s%s' % package, ps_output, re.MULTILINE)
     if not ps_match:
-        print 'Unable to find pid for package %s on device' % package
+        print('Unable to find pid for package %s on device' % package)
         return None
     return int(ps_match.group(1))
 
@@ -114,7 +115,7 @@ class GdbClient(object):
 
         dev_null = open(os.devnull, 'w')
         for lib, local_path in sorted(device_libs):
-            print 'Copying %s' % lib
+            print('Copying %s' % lib)
             local_path = os.path.join(GdbClient.SYSTEM_LIBS_PATH, local_path)
             if not os.path.exists(os.path.dirname(local_path)):
                 os.makedirs(os.path.dirname(local_path))
@@ -144,7 +145,7 @@ class GdbClient(object):
 
         debug_out_path = os.path.join(flutter_root, 'out/%s' % local_engine)
         if not os.path.exists(os.path.join(debug_out_path, 'libflutter.so')):
-            print 'Unable to find libflutter.so. Make sure you have completed a %s build' % local_engine
+            print('Unable to find libflutter.so. Make sure you have completed a %s build' % local_engine)
             return 1
 
         eval_commands = []
diff --git a/sky/tools/install_framework_headers.py b/sky/tools/install_framework_headers.py
@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+#
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
diff --git a/sky/tools/objcopy.py b/sky/tools/objcopy.py
@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+#
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
diff --git a/sky/tools/roll/patch.py b/sky/tools/roll/patch.py
@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+#
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
@@ -33,10 +34,10 @@ def patch(dest_dir, relative_patches_dir=os.curdir):
 
   os.chdir(dest_dir)
   for p in utils.find(["*.patch"], patches_dir):
-    print "applying patch %s" % os.path.basename(p)
+    print("applying patch %s" % os.path.basename(p))
     try:
       utils.system(["git", "apply", p])
       utils.commit("applied patch %s" % os.path.basename(p))
     except subprocess.CalledProcessError:
-      print "ERROR: patch %s failed to apply" % os.path.basename(p)
+      print("ERROR: patch %s failed to apply" % os.path.basename(p))
       raise
diff --git a/sky/tools/roll/roll.py b/sky/tools/roll/roll.py
@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+#
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
@@ -8,7 +9,7 @@
 import os
 import subprocess
 import sys
-import urllib2
+import urllib.request, urllib.error, urllib.parse
 from utils import commit
 from utils import system
 import patch
@@ -96,12 +97,12 @@ def rev(source_dir, dest_dir, dirs_to_rev, name, revision_file=None):
       else:
           d = dir_to_rev
           file_subset = None
-      print "removing directory %s" % d
+      print("removing directory %s" % d)
       try:
           system(["git", "rm", "-r", d], cwd=dest_dir)
       except subprocess.CalledProcessError:
-          print "Could not remove %s" % d
-      print "cloning directory %s" % d
+          print("Could not remove %s" % d)
+      print("cloning directory %s" % d)
 
       if file_subset is None:
           files = system(["git", "ls-files", d], cwd=source_dir).splitlines()
@@ -151,8 +152,8 @@ def main():
       try:
           patch.patch_and_filter(dest_dir, os.path.join('patches', 'chromium'))
       except subprocess.CalledProcessError:
-          print "ERROR: Roll failed due to a patch not applying"
-          print "Fix the patch to apply, commit the result, and re-run this script"
+          print("ERROR: Roll failed due to a patch not applying")
+          print("Fix the patch to apply, commit the result, and re-run this script")
           return 1
 
   return 0
diff --git a/sky/tools/roll/utils.py b/sky/tools/roll/utils.py
@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+#
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
diff --git a/testing/rules/run_gradle.py b/testing/rules/run_gradle.py
@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+#
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
diff --git a/testing/run_tests.py b/testing/run_tests.py
@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+#
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
@@ -27,17 +28,17 @@
 
 
 def PrintDivider(char='='):
-  print '\n'
-  for _ in xrange(4):
-    print(''.join([char for _ in xrange(80)]))
-  print '\n'
+  print('\n')
+  for _ in range(4):
+    print(''.join([char for _ in range(80)]))
+  print('\n')
 
 
 def RunCmd(cmd, forbidden_output=[], expect_failure=False, env=None, **kwargs):
   command_string = ' '.join(cmd)
 
   PrintDivider('>')
-  print 'Running command "%s"' % command_string
+  print('Running command "%s"' % command_string)
 
   start_time = time.time()
   stdout_pipe = sys.stdout if not forbidden_output else subprocess.PIPE
@@ -70,7 +71,7 @@ def RunCmd(cmd, forbidden_output=[], expect_failure=False, env=None, **kwargs):
       raise Exception('command "%s" contained forbidden string %s' % (command_string, forbidden_string))
 
   PrintDivider('<')
-  print 'Command run successfully in %.2f seconds: %s' % (end_time - start_time, command_string)
+  print('Command run successfully in %.2f seconds: %s' % (end_time - start_time, command_string))
 
 
 def IsMac():
@@ -146,7 +147,7 @@ def RunEngineExecutable(build_dir, executable_name, filter, flags=[],
     core_path = os.path.join(cwd, 'core')
     if luci_test_outputs_path and os.path.exists(core_path) and os.path.exists(unstripped_exe):
       dump_path = os.path.join(luci_test_outputs_path, '%s_%s.txt' % (executable_name, sys.platform))
-      print 'Writing core dump analysis to %s' % dump_path
+      print('Writing core dump analysis to %s' % dump_path)
       subprocess.call([
         os.path.join(buildroot_dir, 'flutter', 'testing', 'analyze_core_dump.sh'),
         buildroot_dir, unstripped_exe, core_path, dump_path,
@@ -341,12 +342,12 @@ def RunJavaTests(filter, android_variant='android_debug_unopt'):
   EnsureJavaTestsAreBuilt(android_out_dir)
 
   embedding_deps_dir = os.path.join(buildroot_dir, 'third_party', 'android_embedding_dependencies', 'lib')
-  classpath = map(str, [
+  classpath = list(map(str, [
     os.path.join(buildroot_dir, 'third_party', 'android_tools', 'sdk', 'platforms', 'android-30', 'android.jar'),
     os.path.join(embedding_deps_dir, '*'), # Wildcard for all jars in the directory
     os.path.join(android_out_dir, 'flutter.jar'),
     os.path.join(android_out_dir, 'robolectric_tests.jar')
-  ])
+  ]))
 
   test_class = filter if filter else 'io.flutter.FlutterTestSuite'
   command = [
diff --git a/tools/android_illegal_imports.py b/tools/android_illegal_imports.py
@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+#
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
diff --git a/tools/androidx/generate_pom_file.py b/tools/androidx/generate_pom_file.py
@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+#
 # Copyright 2019 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
diff --git a/tools/dia_dll.py b/tools/dia_dll.py
@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+#
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
diff --git a/tools/font-subset/test.py b/tools/font-subset/test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
diff --git a/tools/fuchsia/build_fuchsia_artifacts.py b/tools/fuchsia/build_fuchsia_artifacts.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
diff --git a/tools/fuchsia/compile_cml.py b/tools/fuchsia/compile_cml.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
diff --git a/tools/fuchsia/copy_debug_symbols.py b/tools/fuchsia/copy_debug_symbols.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
diff --git a/tools/fuchsia/copy_path.py b/tools/fuchsia/copy_path.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
diff --git a/tools/fuchsia/gather_flutter_runner_artifacts.py b/tools/fuchsia/gather_flutter_runner_artifacts.py
diff --git a/tools/fuchsia/gen_package.py b/tools/fuchsia/gen_package.py
diff --git a/tools/fuchsia/gen_repo.py b/tools/fuchsia/gen_repo.py
diff --git a/tools/fuchsia/interpolate_test_suite.py b/tools/fuchsia/interpolate_test_suite.py
diff --git a/tools/fuchsia/make_build_info.py b/tools/fuchsia/make_build_info.py
diff --git a/tools/fuchsia/merge_and_upload_debug_symbols.py b/tools/fuchsia/merge_and_upload_debug_symbols.py
diff --git a/tools/fuchsia/parse_manifest.py b/tools/fuchsia/parse_manifest.py
diff --git a/tools/gen_android_buildconfig.py b/tools/gen_android_buildconfig.py
diff --git a/tools/gen_javadoc.py b/tools/gen_javadoc.py
diff --git a/tools/licenses/lib/main.dart b/tools/licenses/lib/main.dart

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env python`
	`1`	`+#!/usr/bin/env python3`
`2`	`2`	`#`
`3`	`3`	`# Copyright 2013 The Flutter Authors. All rights reserved.`
`4`	`4`	`# Use of this source code is governed by a BSD-style license that can be`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-Signature: 17e2c7f169a5804317b8f79ab1f8a838`
	`1`	`+Signature: fdaf33383efb94fa6bbc158cbc25635c`
`2`	`2`