From b119a6b6090d8f0f79d4fb5b48bf2c3350532056 Mon Sep 17 00:00:00 2001 From: David Sanders Date: Mon, 30 Oct 2023 22:13:15 -0700 Subject: [PATCH] chore: remove py2 compatibility code --- build/dump_syms.py | 2 +- build/npm-run.py | 2 +- build/profile_toolchain.py | 2 +- build/zip.py | 2 +- build/zip_libcxx.py | 2 +- script/add-debug-link.py | 2 +- script/copy-debug-symbols.py | 2 +- script/generate-config-gypi.py | 1 - script/lib/config.py | 1 - script/lib/git.py | 12 +----------- script/lib/native_tests.py | 9 ++------- script/lib/util.py | 7 +------ script/native-tests.py | 2 -- script/patches-mtime-cache.py | 10 +--------- script/release/uploaders/upload-index-json.py | 1 - script/release/uploaders/upload.py | 1 - script/run-clang-format.py | 2 -- script/strip-binaries.py | 2 +- script/verify-chromedriver.py | 2 -- script/verify-ffmpeg.py | 2 +- script/verify-mksnapshot.py | 2 +- script/zip-symbols.py | 1 - 22 files changed, 15 insertions(+), 54 deletions(-) diff --git a/build/dump_syms.py b/build/dump_syms.py index 68cea6394bcd1..8b38944928e59 100644 --- a/build/dump_syms.py +++ b/build/dump_syms.py @@ -1,4 +1,4 @@ -from __future__ import print_function +#!/usr/bin/env python3 import collections import os diff --git a/build/npm-run.py b/build/npm-run.py index 49a6abac65d07..2fcf649f10627 100644 --- a/build/npm-run.py +++ b/build/npm-run.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from __future__ import print_function + import os import subprocess import sys diff --git a/build/profile_toolchain.py b/build/profile_toolchain.py index 6e51a7eaa1423..f2ef85e1cab0c 100755 --- a/build/profile_toolchain.py +++ b/build/profile_toolchain.py @@ -1,4 +1,4 @@ -from __future__ import unicode_literals +#!/usr/bin/env python3 import contextlib import sys diff --git a/build/zip.py b/build/zip.py index 048e40ff7f33c..6c361b1c2a192 100644 --- a/build/zip.py +++ b/build/zip.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from __future__ import print_function + import os import subprocess import sys diff --git a/build/zip_libcxx.py b/build/zip_libcxx.py index 35cc30a78fef4..77e69e9172a52 100644 --- a/build/zip_libcxx.py +++ b/build/zip_libcxx.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from __future__ import print_function + import os import subprocess import sys diff --git a/script/add-debug-link.py b/script/add-debug-link.py index 68ef0d3fd415f..49dda09caac92 100755 --- a/script/add-debug-link.py +++ b/script/add-debug-link.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from __future__ import print_function + import argparse import os import sys diff --git a/script/copy-debug-symbols.py b/script/copy-debug-symbols.py index 2658f9e0d034f..c49d6a4236071 100755 --- a/script/copy-debug-symbols.py +++ b/script/copy-debug-symbols.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from __future__ import print_function + import argparse import os import sys diff --git a/script/generate-config-gypi.py b/script/generate-config-gypi.py index 8a6f23095234b..e55e2474dbe7d 100755 --- a/script/generate-config-gypi.py +++ b/script/generate-config-gypi.py @@ -1,6 +1,5 @@ #!/usr/bin/env python3 -from __future__ import print_function import ast import os import pprint diff --git a/script/lib/config.py b/script/lib/config.py index 3db917d172fba..34c8281ba0c52 100644 --- a/script/lib/config.py +++ b/script/lib/config.py @@ -1,6 +1,5 @@ #!/usr/bin/env python3 -from __future__ import print_function import os import sys diff --git a/script/lib/git.py b/script/lib/git.py index 93e61e6757ad4..7493b85b0fd4c 100644 --- a/script/lib/git.py +++ b/script/lib/git.py @@ -6,8 +6,6 @@ structure, or make assumptions about the passed arguments or calls' outcomes. """ -from __future__ import unicode_literals - import io import os import posixpath @@ -229,14 +227,6 @@ def remove_patch_filename(patch): force_keep_next_line = l.startswith('Subject: ') -def to_utf8(patch): - """Python 2/3 compatibility: unicode has been renamed to str in Python3""" - if sys.version_info[0] >= 3: - return str(patch, "utf-8") - - return unicode(patch, "utf-8") - - def export_patches(repo, out_dir, patch_range=None, dry_run=False): if not os.path.exists(repo): sys.stderr.write( @@ -263,7 +253,7 @@ def export_patches(repo, out_dir, patch_range=None, dry_run=False): for patch in patches: filename = get_file_name(patch) filepath = posixpath.join(out_dir, filename) - existing_patch = to_utf8(io.open(filepath, 'rb').read()) + existing_patch = str(io.open(filepath, 'rb').read(), 'utf-8') formatted_patch = join_patch(patch) if formatted_patch != existing_patch: bad_patches.append(filename) diff --git a/script/lib/native_tests.py b/script/lib/native_tests.py index ff3a3a74b2bf2..f57a46ecd316f 100644 --- a/script/lib/native_tests.py +++ b/script/lib/native_tests.py @@ -1,4 +1,4 @@ -from __future__ import print_function +#!/usr/bin/env python3 import os import subprocess @@ -10,11 +10,6 @@ sys.path.append(PYYAML_LIB_DIR) import yaml #pylint: disable=wrong-import-position,wrong-import-order -try: - basestring # Python 2 -except NameError: # Python 3 - basestring = str # pylint: disable=redefined-builtin - class Verbosity: CHATTY = 'chatty' # stdout and stderr @@ -148,7 +143,7 @@ def __expand_shorthand(value): if isinstance(value, dict): return value - if isinstance(value, basestring): + if isinstance(value, str): return {value: None} raise AssertionError("unexpected shorthand type: {}".format(type(value))) diff --git a/script/lib/util.py b/script/lib/util.py index b33828a2a53d0..762c1378799e6 100644 --- a/script/lib/util.py +++ b/script/lib/util.py @@ -1,6 +1,5 @@ #!/usr/bin/env python3 -from __future__ import print_function import contextlib import errno import json @@ -8,11 +7,7 @@ import shutil import subprocess import sys -# Python 3 / 2 compat import -try: - from urllib.request import urlopen -except ImportError: - from urllib2 import urlopen +from urllib.request import urlopen import zipfile # from lib.config import is_verbose_mode diff --git a/script/native-tests.py b/script/native-tests.py index 7a577bc75f434..5e12aabbd76da 100755 --- a/script/native-tests.py +++ b/script/native-tests.py @@ -1,7 +1,5 @@ #!/usr/bin/env python3 -from __future__ import print_function - import argparse import os import sys diff --git a/script/patches-mtime-cache.py b/script/patches-mtime-cache.py index b173b0bc7fcf9..2f515ed62c605 100644 --- a/script/patches-mtime-cache.py +++ b/script/patches-mtime-cache.py @@ -1,7 +1,5 @@ #!/usr/bin/env python3 -from __future__ import print_function - import argparse import hashlib import json @@ -168,13 +166,7 @@ def main(): traceback.print_exc(file=sys.stderr) return 0 elif args.operation == "set": - # Python 2/3 compatibility - try: - user_input = raw_input - except NameError: - user_input = input - - answer = user_input( + answer = input( "WARNING: Manually setting mtimes could mess up your build. " "If you're sure, type yes: " ) diff --git a/script/release/uploaders/upload-index-json.py b/script/release/uploaders/upload-index-json.py index 348023cf2cbd3..2a33d1ded5562 100755 --- a/script/release/uploaders/upload-index-json.py +++ b/script/release/uploaders/upload-index-json.py @@ -1,6 +1,5 @@ #!/usr/bin/env python3 -from __future__ import print_function import json import os import sys diff --git a/script/release/uploaders/upload.py b/script/release/uploaders/upload.py index 96e195f49722d..a486449abe1a0 100755 --- a/script/release/uploaders/upload.py +++ b/script/release/uploaders/upload.py @@ -1,6 +1,5 @@ #!/usr/bin/env python3 -from __future__ import print_function import argparse import datetime import hashlib diff --git a/script/run-clang-format.py b/script/run-clang-format.py index 345b504617697..9597d4a0d1413 100644 --- a/script/run-clang-format.py +++ b/script/run-clang-format.py @@ -7,8 +7,6 @@ A diff output is produced and a sensible exit code is returned. """ -from __future__ import print_function, unicode_literals - import argparse import codecs import difflib diff --git a/script/strip-binaries.py b/script/strip-binaries.py index f01e35bf8b511..e21fdeb6a6e96 100755 --- a/script/strip-binaries.py +++ b/script/strip-binaries.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from __future__ import print_function + import argparse import os import sys diff --git a/script/verify-chromedriver.py b/script/verify-chromedriver.py index fba6869b0c8bf..880c8a70b7076 100644 --- a/script/verify-chromedriver.py +++ b/script/verify-chromedriver.py @@ -1,7 +1,5 @@ #!/usr/bin/env python3 -from __future__ import print_function - import argparse import os import re diff --git a/script/verify-ffmpeg.py b/script/verify-ffmpeg.py index 0ee4ffe3093f4..84bdf6baa1e9b 100755 --- a/script/verify-ffmpeg.py +++ b/script/verify-ffmpeg.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from __future__ import print_function + import argparse import os import platform diff --git a/script/verify-mksnapshot.py b/script/verify-mksnapshot.py index 7efbc59dbe5f7..41114c0402332 100755 --- a/script/verify-mksnapshot.py +++ b/script/verify-mksnapshot.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -from __future__ import print_function + import argparse import glob import os diff --git a/script/zip-symbols.py b/script/zip-symbols.py index 969297e597eaa..0f7785ad8b1df 100755 --- a/script/zip-symbols.py +++ b/script/zip-symbols.py @@ -1,6 +1,5 @@ #!/usr/bin/env python3 -from __future__ import print_function import argparse import glob import os