Fixup Python formatting and ruff lints

Author: mhammond

automation/prepare-release.py

@@ -29,7 +29,7 @@
 moz_remote = get_moz_remote()
 
 # 2. Figure out the current version
-with open(VERSION_FILE, "r") as stream:
+with open(VERSION_FILE) as stream:
     cur_version = stream.read().strip()
 
 major_version_number = int(cur_version.split(".")[0])
@@ -59,7 +59,7 @@
     stream.write(new_version)
 
 step_msg(f"updating {CHANGELOG_FILE}")
-with open(CHANGELOG_FILE, "r") as stream:
+with open(CHANGELOG_FILE) as stream:
     changelog = stream.read().splitlines()
 
 if changelog[0] != f"# v{major_version_number}.0 (In progress)":

automation/publish_to_maven_local_if_modified.py

@@ -10,9 +10,9 @@
 import argparse
 import hashlib
 import os
+import shutil
 import sys
 import time
-import shutil
 
 from shared import fatal_err, find_app_services_root, run_cmd_checked
 

automation/symbols-generation/symbolstore.py

@@ -21,7 +21,6 @@
 #     -s <srcdir>  : Use <srcdir> as the top source directory to
 #                    generate relative filenames.
 
-from __future__ import print_function
 
 import ctypes
 import errno
@@ -441,7 +440,7 @@ def dump_syms_cmdline(self, file, arch, dsymbundle=None):
     def dump_syms_extra_info(self):
         return [
             "--extra-info",
-            "VERSION {}".format(get_version(self.srcdirs)),
+            f"VERSION {get_version(self.srcdirs)}",
             "--extra-info",
             "PRODUCTNAME ApplicationServices",
         ]

automation/symbols-generation/upload_symbols.py

@@ -3,7 +3,6 @@
 # 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 os
 import shutil
@@ -19,7 +18,7 @@
 
 def upload_symbols(zip_file, token_file):
     print(
-        "Uploading symbols file '{0}' to '{1}'".format(zip_file, DEFAULT_SYMBOL_URL),
+        f"Uploading symbols file '{zip_file}' to '{DEFAULT_SYMBOL_URL}'",
         file=sys.stdout,
     )
     zip_name = os.path.basename(zip_file)
@@ -28,7 +27,7 @@ def upload_symbols(zip_file, token_file):
     # already that communication with Taskcluster to get the credentials for
     # communicating with the server
     auth_token = ""
-    with open(token_file, "r") as f:
+    with open(token_file) as f:
         auth_token = f.read().strip()
     if len(auth_token) == 0:
         print("Failed to get the symbol token.", file=sys.stderr)
@@ -51,15 +50,15 @@ def upload_symbols(zip_file, token_file):
                 # has to fetch the entire zip file, which can take a while. The load balancer
                 # in front of symbols.mozilla.org has a 300 second timeout, so we'll use that.
                 timeout=(10, 300),
-                **zip_arg
+                **zip_arg,
             )
             # 500 is likely to be a transient failure.
             # Break out for success or other error codes.
             if r.status_code < 500:
                 break
-            print("Error: {0}".format(r), file=sys.stderr)
+            print(f"Error: {r}", file=sys.stderr)
         except requests.exceptions.RequestException as e:
-            print("Error: {0}".format(e), file=sys.stderr)
+            print(f"Error: {e}", file=sys.stderr)
         print("Retrying...", file=sys.stdout)
     else:
         print("Maximum retries hit, giving up!", file=sys.stderr)
@@ -69,7 +68,7 @@ def upload_symbols(zip_file, token_file):
         print("Uploaded successfully", file=sys.stdout)
         return True
 
-    print("Upload symbols failed: {0}".format(r), file=sys.stderr)
+    print(f"Upload symbols failed: {r}", file=sys.stderr)
     print(r.text, file=sys.stderr)
     return False
 

automation/tests.py

@@ -65,13 +65,13 @@
 def blue_text(text):
     if not sys.stdout.isatty():
         return text
-    return "\033[96m{}\033[0m".format(text)
+    return f"\033[96m{text}\033[0m"
 
 
 def yellow_text(text):
     if not sys.stdout.isatty():
         return text
-    return "\033[93m{}\033[0m".format(text)
+    return f"\033[93m{text}\033[0m"
 
 
 def get_output(cmdline, **kwargs):
@@ -316,7 +316,7 @@ def touch_changed_paths(branch_changes):
 
 
 def print_rust_environment():
-    print("platform: {}".format(platform.uname()))
+    print(f"platform: {platform.uname()}")
     print("rustc version: {}".format(get_output(["rustc", "--version"]).strip()))
     print("cargo version: {}".format(get_output(["cargo", "--version"]).strip()))
     print("rustfmt version: {}".format(get_output(["rustfmt", "--version"]).strip()))
@@ -498,15 +498,15 @@ def __init__(self, name, func, *args, **kwargs):
 
     def run(self):
         print()
-        print(blue_text("Running {}".format(self.name)))
+        print(blue_text(f"Running {self.name}"))
         try:
             self.func(*self.args, **self.kwargs)
         except subprocess.CalledProcessError:
-            exit_with_error(1, "Error while running {}".format(self.name))
+            exit_with_error(1, f"Error while running {self.name}")
         except Exception:
             exit_with_error(
                 2,
-                "Unexpected exception while running {}".format(self.name),
+                f"Unexpected exception while running {self.name}",
                 print_exception=True,
             )
 
@@ -528,7 +528,7 @@ def calc_steps(args):
         for package, features in calc_rust_items():
             if should_run_rust_tests(package, False):
                 yield Step(
-                    "tests for {} ({})".format(package.name, features.label()),
+                    f"tests for {package.name} ({features.label()})",
                     run_rust_test,
                     package,
                     features,
@@ -539,7 +539,7 @@ def calc_steps(args):
         for package, features in calc_rust_items():
             if should_run_rust_tests(package, True):
                 yield Step(
-                    "tests for {} ({})".format(package.name, features.label()),
+                    f"tests for {package.name} ({features.label()})",
                     run_rust_test,
                     package,
                     features,
@@ -549,7 +549,7 @@ def calc_steps(args):
         yield Step("cargo clean", cargo_clean)
         for package, features in calc_rust_items():
             yield Step(
-                "clippy for {} ({})".format(package.name, features.label()),
+                f"clippy for {package.name} ({features.label()})",
                 run_clippy,
                 package,
                 features,
@@ -558,7 +558,7 @@ def calc_steps(args):
         # make sure they don't go stale.
         for package, features in calc_non_workspace_rust_items():
             yield Step(
-                "clippy for {} ({})".format(package.name, features.label()),
+                f"clippy for {package.name} ({features.label()})",
                 run_clippy,
                 package,
                 features,
@@ -582,7 +582,7 @@ def calc_steps(args):
     elif args.mode == "python-tests":
         yield Step("python tests", run_python_tests)
     else:
-        print("Invalid mode: {}".format(args.mode))
+        print(f"Invalid mode: {args.mode}")
         sys.exit(1)
 
 
@@ -614,22 +614,20 @@ def calc_steps_change_mode(args):
     yield Step("touch changed paths", touch_changed_paths, branch_changes)
     for package, features in rust_items:
         yield Step(
-            "tests for {} ({})".format(package.name, features.label()),
+            f"tests for {package.name} ({features.label()})",
             run_rust_test,
             package,
             features,
         )
     for package, features in rust_items:
         yield Step(
-            "clippy for {} ({})".format(package.name, features.label()),
+            f"clippy for {package.name} ({features.label()})",
             run_clippy,
             package,
             features,
         )
     for package in rust_packages:
-        yield Step(
-            "rustfmt for {}".format(package.name), cargo_fmt, package, fix_issues=True
-        )
+        yield Step(f"rustfmt for {package.name}", cargo_fmt, package, fix_issues=True)
     yield Step("Check for changes", check_for_fmt_changes, branch_changes)
 
 

taskcluster/app_services_taskgraph/build_config.py

@@ -51,7 +51,7 @@ def get_version_from_version_txt():
     current_dir = os.path.dirname(os.path.realpath(__file__))
     project_dir = os.path.realpath(os.path.join(current_dir, "..", ".."))
 
-    with open(os.path.join(project_dir, "version.txt"), "r") as f:
+    with open(os.path.join(project_dir, "version.txt")) as f:
         return f.read().strip()
 
 
@@ -62,9 +62,7 @@ def get_extensions(module_name):
         artifact_type = publication["type"]
         if artifact_type not in EXTENSIONS:
             raise ValueError(
-                "For '{}', 'publication->type' must be one of {}".format(
-                    module_name, repr(EXTENSIONS.keys())
-                )
+                f"For '{module_name}', 'publication->type' must be one of {repr(EXTENSIONS.keys())}"
             )
         extensions[publication["name"]] = [
             extension + checksum_extension

taskcluster/app_services_taskgraph/job.py

@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-from pipes import quote as shell_quote
+from shlex import quote as shell_quote
 
 from taskgraph.transforms.run import configure_taskdesc_for_run, run_task_using
 from taskgraph.util.schema import Schema, taskref_or_string

taskcluster/app_services_taskgraph/transforms/__init__.py

@@ -44,13 +44,9 @@ def publications_to_artifact_map_paths(
             artifact_filename = _artifact_filename(publication_name, version, extension)
             if preview_build is not None:
                 # Both nightly and other preview builds are places in separate directory
-                destination = "maven2/org/mozilla/appservices/nightly/{}/{}/{}".format(
-                    publication_name, version, artifact_filename
-                )
+                destination = f"maven2/org/mozilla/appservices/nightly/{publication_name}/{version}/{artifact_filename}"
             else:
-                destination = "maven2/org/mozilla/appservices/{}/{}/{}".format(
-                    publication_name, version, artifact_filename
-                )
+                destination = f"maven2/org/mozilla/appservices/{publication_name}/{version}/{artifact_filename}"
             build_map_paths[f"public/build/{artifact_filename}"] = {
                 "checksums_path": "",  # XXX beetmover marks this as required, but it's not needed
                 "destinations": [destination],

taskcluster/app_services_taskgraph/transforms/deps_complete.py

@@ -71,8 +71,8 @@ def add_alert_routes(config, tasks):
         task.setdefault("routes", [])
         for name, value in alerts.items():
             if name not in ("slack-channel", "email", "pulse", "matrix-room"):
-                raise KeyError("Unknown alert type: {}".format(name))
-            task["routes"].append("notify.{}.{}.on-failed".format(name, value))
+                raise KeyError(f"Unknown alert type: {name}")
+            task["routes"].append(f"notify.{name}.{value}.on-failed")
         yield task
 
 

taskcluster/scripts/generate-nimbus-cli-json.py

@@ -29,7 +29,7 @@ def dump_json(args):
     dir = os.path.dirname(args.path)
     if not os.path.exists(dir):
         os.makedirs(dir)
-    with open(args.path, "wt") as f:
+    with open(args.path, "w") as f:
         json.dump(data, f)
 
 

taskcluster/scripts/generate-release-json.py

@@ -52,7 +52,7 @@ def dump_json(args):
     dir = os.path.dirname(args.path)
     if not os.path.exists(dir):
         os.makedirs(dir)
-    with open(args.path, "wt") as f:
+    with open(args.path, "w") as f:
         json.dump(data, f)
 
 

taskcluster/scripts/server-megazord-build.py

@@ -145,7 +145,7 @@ def _patch_uniffi_tomls():
 
 
 def _replace_text(filename, search, replace):
-    with open(filename, "r") as file:
+    with open(filename) as file:
         data = file.read()
     data = data.replace(search, replace)
     with open(filename, "w") as file:

tools/dependency_summary.py

@@ -904,7 +904,6 @@
             "fixup": "https://raw.githubusercontent.com/dtolnay/unicode-ident/master/LICENSE-APACHE",
         },
     },
-
     "xshell-macros": {
         "license": {
             "check": "MIT OR Apache-2.0",
@@ -959,7 +958,7 @@ def subprocess_run_cargo(args):
         ("cargo",) + args,
         env=env,
         stdout=subprocess.PIPE,
-        universal_newlines=True,
+        text=True,
         check=False,
     )
     p.check_returncode()
@@ -975,7 +974,7 @@ def get_workspace_metadata():
     )
 
 
-class WorkspaceMetadata(object):
+class WorkspaceMetadata:
     """Package metadata for all dependencies in the workspace.
 
     This uses `cargo metadata` to load the complete set of package metadata for the dependency tree
@@ -1192,9 +1191,7 @@ def pick_most_acceptable_license(self, id, licenseId):
             if license in licenses:
                 return license
         raise RuntimeError(
-            "Could not determine acceptable license for {}; license is '{}'".format(
-                id, licenseId
-            )
+            f"Could not determine acceptable license for {id}; license is '{licenseId}'"
         )
 
     def _find_license_file(self, id, license, pkgInfo):
@@ -1222,7 +1219,7 @@ def _find_license_file(self, id, license, pkgInfo):
                 pkgInfo["name"]
             )
             err += "Please select the correct license file and add it to `PACKAGE_METADATA_FIXUPS`.\n"
-            err += "Potential license files: {}".format(foundLicenseFiles)
+            err += f"Potential license files: {foundLicenseFiles}"
         else:
             err = "Could not find license file for '{}'.\n".format(pkgInfo["name"])
             err += "Please locate the correct license file and add it to `PACKAGE_METADATA_FIXUPS`.\n"
@@ -1288,10 +1285,8 @@ def _find_license_url(self, id, chosenLicense, licenseFile, pkgInfo):
         if licenseUrl is None:
             err = "Could not infer license URL for '{}'.\n".format(pkgInfo["name"])
             err += "Please locate the correct license URL and add it to `PACKAGE_METADATA_FIXUPS`.\n"
-            err += "You may need to poke around in the source repository at {}".format(
-                repo
-            )
-            err += " for a {} license file named {}.".format(chosenLicense, licenseFile)
+            err += f"You may need to poke around in the source repository at {repo}"
+            err += f" for a {chosenLicense} license file named {licenseFile}."
             raise RuntimeError(err)
         # As a special case, convert raw github URLs back into human-friendly page URLs.
         if licenseUrl.startswith("https://raw.githubusercontent.com/"):
@@ -1314,7 +1309,7 @@ def make_license_title(license, deps=None):
     elif license == "Apache-2.0":
         title = "Apache License 2.0"
     else:
-        title = "{} License".format(license)
+        title = f"{license} License"
     if deps:
         # Dedupe in case of multiple versions of dependencies
         names = sorted(set(d["name"] for d in deps))
@@ -1560,7 +1555,7 @@ def pf(string, *args):
     if args.check:
         output.seek(0)
         outlines = output.readlines()
-        with open(args.check, "r") as f:
+        with open(args.check) as f:
             checklines = f.readlines()
             if outlines != checklines:
                 raise RuntimeError(

tools/loc_summary.py

@@ -68,7 +68,7 @@ def get_loc_summary(path):
             path,
         ],
         stdout=subprocess.PIPE,
-        universal_newlines=True,
+        text=True,
         check=False,
     )
     p.check_returncode()

tools/update-moz-central-vendoring.py

@@ -59,7 +59,7 @@ def get_app_services_rev():
 
 def update_cargo_toml(cargo_toml_path, app_services_rev):
     print(f"Updating application-services revision to {app_services_rev}")
-    with open(cargo_toml_path, "r") as f:
+    with open(cargo_toml_path) as f:
         lines = f.readlines()
         for i in range(len(lines)):
             line = lines[i]