chore: remove py2 compatibility code (#40375)
This commit is contained in:
parent
bc1ba1fe9d
commit
425efb5e47
22 changed files with 15 additions and 54 deletions
|
@ -1,6 +1,5 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
from __future__ import print_function
|
||||
import os
|
||||
import sys
|
||||
|
||||
|
|
|
@ -6,8 +6,6 @@ Everything here should be project agnostic: it shouldn't rely on project's
|
|||
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)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
from __future__ import print_function
|
||||
#!/usr/bin/env python3
|
||||
|
||||
import os
|
||||
import subprocess
|
||||
|
@ -10,11 +10,6 @@ PYYAML_LIB_DIR = os.path.join(SRC_DIR, 'third_party', 'pyyaml', 'lib')
|
|||
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 @@ class TestsList():
|
|||
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)))
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
from __future__ import print_function
|
||||
import contextlib
|
||||
import errno
|
||||
import json
|
||||
|
@ -8,11 +7,7 @@ import os
|
|||
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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue