chore: bump pylint to 2.17 (#41576)

* build: bump pylint to 2.17

Xref: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5062345

* fix pylint consider-using-f-string warnings pt 1: use flynt for automated fixes

* fix pylint consider-using-f-string warnings pt 2: manual fixes

* fix pylint consider-using-with warnings

* fix pylint line-too-long warnings

* fix pylint unspecified-encoding warnings

* fix py lint consider-using-generator warning

* fixup! fix pylint unspecified-encoding warnings

* fix pylint line-too-long warnings
This commit is contained in:
Charles Kerr
2024-03-21 08:48:23 -05:00
committed by GitHub
parent 00da7279cb
commit 61ddb1aa07
25 changed files with 193 additions and 205 deletions

View File

@@ -32,9 +32,8 @@ def get_content(retry_count = 5):
headers={"Authorization" : authToken}
)
proposed_content = urlopen(
request
).read()
with urlopen(request) as resp:
proposed_content = resp.read()
if is_json(proposed_content):
return proposed_content

View File

@@ -29,7 +29,7 @@ def main():
]
if args.target_dir is None:
store_artifact(directory, 'headers/dist/{0}'.format(args.version),
store_artifact(directory, f'headers/dist/{args.version}',
checksums)
else:
copy_files(checksums, args.target_dir)
@@ -51,10 +51,10 @@ def parse_args():
def get_files_list(version):
return [
{ "filename": 'node-{0}.tar.gz'.format(version), "required": True },
{ "filename": 'node-{0}-headers.tar.gz'.format(version), "required": True },
{ "filename": 'iojs-{0}.tar.gz'.format(version), "required": True },
{ "filename": 'iojs-{0}-headers.tar.gz'.format(version), "required": True },
{ "filename": f'node-{version}.tar.gz', "required": True },
{ "filename": f'node-{version}-headers.tar.gz', "required": True },
{ "filename": f'iojs-{version}.tar.gz', "required": True },
{ "filename": f'iojs-{version}-headers.tar.gz', "required": True },
{ "filename": 'node.lib', "required": False },
{ "filename": 'x64/node.lib', "required": False },
{ "filename": 'win-x86/iojs.lib', "required": False },
@@ -91,8 +91,8 @@ def create_checksum(algorithm, directory, filename, files):
lines.append(h.hexdigest() + ' ' + os.path.relpath(path, directory))
checksum_file = os.path.join(directory, filename)
with open(checksum_file, 'w') as f:
f.write('\n'.join(lines) + '\n')
with open(checksum_file, 'w', encoding='utf-8') as fout:
fout.write('\n'.join(lines) + '\n')
return checksum_file
def copy_files(source_files, output_dir):

View File

@@ -45,9 +45,9 @@ def upload_node(version):
versioned_header_tar = header_tar.format(version)
shutil.copy2(generated_tar, os.path.join(GEN_DIR, versioned_header_tar))
store_artifact(GEN_DIR, 'headers/dist/{0}'.format(version),
store_artifact(GEN_DIR, f'headers/dist/{version}',
glob.glob('node-*.tar.gz'))
store_artifact(GEN_DIR, 'headers/dist/{0}'.format(version),
store_artifact(GEN_DIR, f'headers/dist/{version}',
glob.glob('iojs-*.tar.gz'))
if PLATFORM == 'win32':
@@ -73,13 +73,13 @@ def upload_node(version):
shutil.copy2(electron_lib, v4_node_lib)
# Upload the node.lib.
store_artifact(DIST_DIR, 'headers/dist/{0}'.format(version), [node_lib])
store_artifact(DIST_DIR, f'headers/dist/{version}', [node_lib])
# Upload the iojs.lib.
store_artifact(DIST_DIR, 'headers/dist/{0}'.format(version), [iojs_lib])
store_artifact(DIST_DIR, f'headers/dist/{version}', [iojs_lib])
# Upload the v4 node.lib.
store_artifact(DIST_DIR, 'headers/dist/{0}'.format(version),
store_artifact(DIST_DIR, f'headers/dist/{version}',
[v4_node_lib])

View File

@@ -26,7 +26,7 @@ PRODUCT_NAME = get_electron_branding()['product_name']
SYMBOLS_DIR = os.path.join(RELEASE_DIR, 'breakpad_symbols')
PDB_LIST = [
os.path.join(RELEASE_DIR, '{0}.exe.pdb'.format(PROJECT_NAME))
os.path.join(RELEASE_DIR, f'{PROJECT_NAME}.exe.pdb')
]
PDB_LIST += glob.glob(os.path.join(RELEASE_DIR, '*.dll.pdb'))

View File

@@ -53,9 +53,8 @@ def main():
build_version = get_electron_build_version()
if not ELECTRON_VERSION.startswith(build_version):
error = 'Tag name ({0}) should match build version ({1})\n'.format(
ELECTRON_VERSION, build_version)
sys.stderr.write(error)
errmsg = f"Tag ({ELECTRON_VERSION}) should match build ({build_version})\n"
sys.stderr.write(errmsg)
sys.stderr.flush()
return 1
@@ -344,8 +343,7 @@ def upload_electron(release, file_path, args):
# if upload_to_storage is set, skip github upload.
# todo (vertedinde): migrate this variable to upload_to_storage
if args.upload_to_storage:
key_prefix = 'release-builds/{0}_{1}'.format(args.version,
args.upload_timestamp)
key_prefix = f'release-builds/{args.version}_{args.upload_timestamp}'
store_artifact(os.path.dirname(file_path), key_prefix, [file_path])
upload_sha256_checksum(args.version, file_path, key_prefix)
return
@@ -358,30 +356,30 @@ def upload_electron(release, file_path, args):
def upload_io_to_github(release, filename, filepath, version):
print('Uploading %s to GitHub' % \
(filename))
print(f'Uploading {filename} to GitHub')
script_path = os.path.join(
ELECTRON_DIR, 'script', 'release', 'uploaders', 'upload-to-github.ts')
upload_process = subprocess.Popen([TS_NODE, script_path, filepath, filename,
str(release['id']), version], stdout=subprocess.PIPE,
stderr=subprocess.STDOUT)
if is_verbose_mode():
for c in iter(lambda: upload_process.stdout.read(1), b""):
sys.stdout.buffer.write(c)
sys.stdout.flush()
with subprocess.Popen([TS_NODE, script_path, filepath,
filename, str(release['id']), version],
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT) as upload_process:
if is_verbose_mode():
for c in iter(lambda: upload_process.stdout.read(1), b""):
sys.stdout.buffer.write(c)
sys.stdout.flush()
def upload_sha256_checksum(version, file_path, key_prefix=None):
checksum_path = '{}.sha256sum'.format(file_path)
checksum_path = f'{file_path}.sha256sum'
if key_prefix is None:
key_prefix = 'checksums-scratchpad/{0}'.format(version)
key_prefix = f'checksums-scratchpad/{version}'
sha256 = hashlib.sha256()
with open(file_path, 'rb') as f:
sha256.update(f.read())
filename = os.path.basename(file_path)
with open(checksum_path, 'w') as checksum:
checksum.write('{} *{}'.format(sha256.hexdigest(), filename))
with open(checksum_path, 'w', encoding='utf-8') as checksum:
checksum.write(f'{sha256.hexdigest()} *{filename}')
store_artifact(os.path.dirname(checksum_path), key_prefix, [checksum_path])
@@ -394,7 +392,7 @@ def get_release(version):
release_env['NODE_NO_WARNINGS'] = '1'
release_info = execute(['node', script_path, version], release_env)
if is_verbose_mode():
print('Release info for version: {}:\n'.format(version))
print(f'Release info for version: {version}:\n')
print(release_info)
release = json.loads(release_info)
return release