Use f-strings

Author: hugovk

add-to-pydotorg.py

@@ -47,14 +47,14 @@ def run_cmd(cmd, silent=False, shell=True, **kwargs):
     if shell:
         cmd = " ".join(cmd)
     if not silent:
-        print("Executing %s" % cmd)
+        print(f"Executing {cmd}")
     try:
         if silent:
             subprocess.check_call(cmd, shell=shell, stdout=subprocess.PIPE, **kwargs)
         else:
             subprocess.check_call(cmd, shell=shell, **kwargs)
     except subprocess.CalledProcessError:
-        error("%s failed" % cmd)
+        error(f"{cmd} failed")
 
 
 try:
@@ -72,7 +72,7 @@ def run_cmd(cmd, silent=False, shell=True, **kwargs):
 
 tag_cre = re.compile(r"(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:([ab]|rc)(\d+))?$")
 
-headers = {"Authorization": "ApiKey %s" % auth_info, "Content-Type": "application/json"}
+headers = {"Authorization": f"ApiKey {auth_info}", "Content-Type": "application/json"}
 
 github_oidc_provider = "https://github.com/login/oauth"
 google_oidc_provider = "https://accounts.google.com"
@@ -153,9 +153,9 @@ def get_file_descriptions(release):
 
 
 def changelog_for(release):
-    new_url = "http://docs.python.org/release/%s/whatsnew/changelog.html" % release
+    new_url = f"http://docs.python.org/release/{release}/whatsnew/changelog.html"
     if requests.head(new_url).status_code != 200:
-        return "http://hg.python.org/cpython/file/v%s/Misc/NEWS" % release
+        return f"http://hg.python.org/cpython/file/v{release}/Misc/NEWS"
 
 
 def slug_for(release):
@@ -204,8 +204,8 @@ def build_file_dict(release, rfile, rel_pk, file_desc, os_pk, add_download, add_
     d = {
         "name": file_desc,
         "slug": slug_for(release) + "-" + make_slug(file_desc)[:40],
-        "os": "/api/v1/downloads/os/%s/" % os_pk,
-        "release": "/api/v1/downloads/release/%s/" % rel_pk,
+        "os": f"/api/v1/downloads/os/{os_pk}/",
+        "release": f"/api/v1/downloads/release/{rel_pk}/",
         "description": add_desc,
         "is_source": os_pk == 3,
         "url": download_root + f"{base_version(release)}/{rfile}",
@@ -276,7 +276,7 @@ def list_files(release):
 
 def query_object(objtype, **params):
     """Find an API object by query parameters."""
-    uri = base_url + "downloads/%s/" % objtype
+    uri = base_url + f"downloads/{objtype}/"
     uri += "?" + "&".join(f"{k}={v}" for k, v in params.items())
     resp = requests.get(uri, headers=headers)
     if resp.status_code != 200 or not json.loads(resp.text)["objects"]:
@@ -391,20 +391,20 @@ def main():
             continue
         print("Creating ReleaseFile object for", rfile, key)
         if key in file_dicts:
-            raise RuntimeError("duplicate slug generated: %s" % key)
+            raise RuntimeError(f"duplicate slug generated: {key}")
         file_dicts[key] = file_dict
     print("Deleting previous release files")
     resp = requests.delete(
-        base_url + "downloads/release_file/?release=%s" % rel_pk, headers=headers
+        base_url + f"downloads/release_file/?release={rel_pk}", headers=headers
     )
     if resp.status_code != 204:
-        raise RuntimeError("deleting previous releases failed: %s" % resp.status_code)
+        raise RuntimeError(f"deleting previous releases failed: {resp.status_code}")
     for file_dict in file_dicts.values():
         file_pk = post_object("release_file", file_dict)
         if file_pk >= 0:
             print("Created as id =", file_pk)
             n += 1
-    print("Done - %d files added" % n)
+    print(f"Done - {n} files added")
 
 
 if not sys.flags.interactive:

release.py

@@ -38,14 +38,14 @@ def run_cmd(cmd, silent=False, shell=False, **kwargs):
     if shell:
         cmd = SPACE.join(cmd)
     if not silent:
-        print("Executing %s" % cmd)
+        print(f"Executing {cmd}")
     try:
         if silent:
             subprocess.check_call(cmd, shell=shell, stdout=subprocess.PIPE, **kwargs)
         else:
             subprocess.check_call(cmd, shell=shell, **kwargs)
     except subprocess.CalledProcessError:
-        error("%s failed" % cmd)
+        error(f"{cmd} failed")
 
 
 readme_re = re.compile(r"This is Python version [23]\.\d").match
@@ -186,7 +186,7 @@ def constant_replace(fn, updated_constants, comment_start="/*", comment_end="*/"
             else:
                 outfile.write(line)
     if not found_constants:
-        error("Constant section delimiters not found: %s" % fn)
+        error(f"Constant section delimiters not found: {fn}")
     os.rename(fn + ".new", fn)
 
 
@@ -217,7 +217,7 @@ def tweak_patchlevel(tag, done=False):
 
 
 def bump(tag):
-    print("Bumping version to %s" % tag)
+    print(f"Bumping version to {tag}")
 
     tweak_patchlevel(tag)
 
@@ -240,10 +240,10 @@ def bump(tag):
     print("\nManual editing time...")
     for fn in other_files:
         if os.path.exists(fn):
-            print("Edit %s" % fn)
+            print(f"Edit {fn}")
             manual_edit(fn)
         else:
-            print("Skipping %s" % fn)
+            print(f"Skipping {fn}")
 
     print("Bumped revision")
     if extra_work:
@@ -258,7 +258,7 @@ def manual_edit(fn: str) -> None:
 
 @contextmanager
 def pushd(new):
-    print("chdir'ing to %s" % new)
+    print(f"chdir'ing to {new}")
     old = os.getcwd()
     os.chdir(new)
     try:
@@ -272,11 +272,11 @@ def make_dist(name):
         os.mkdir(name)
     except OSError:
         if os.path.isdir(name):
-            print("WARNING: dist dir %s already exists" % name, file=sys.stderr)
+            print(f"WARNING: dist dir {name} already exists", file=sys.stderr)
         else:
-            error("%s/ is not a directory" % name)
+            error(f"{name}/ is not a directory")
     else:
-        print("created dist directory %s" % name)
+        print(f"created dist directory {name}")
 
 
 def tarball(source, clamp_mtime):
@@ -330,25 +330,25 @@ def tarball(source, clamp_mtime):
 def export(tag, silent=False, skip_docs=False):
     make_dist(tag.text)
     print("Exporting tag:", tag.text)
-    archivename = "Python-%s" % tag.text
+    archivename = f"Python-{tag.text}"
     # I have not figured out how to get git to directly produce an
     # archive directory like hg can, so use git to produce a temporary
     # tarball then expand it with tar.
-    archivetempfile = "%s.tar" % archivename
+    archivetempfile = f"{archivename}.tar"
     run_cmd(
         [
             "git",
             "archive",
             "--format=tar",
-            "--prefix=%s/" % archivename,
+            f"--prefix={archivename}/",
             "-o",
             archivetempfile,
             tag.gitname,
         ],
         silent=silent,
     )
     with pushd(tag.text):
-        archivetempfile = "../%s" % archivetempfile
+        archivetempfile = f"../{archivetempfile}"
         run_cmd(["tar", "-xf", archivetempfile], silent=silent)
         os.unlink(archivetempfile)
         with pushd(archivename):
@@ -446,7 +446,7 @@ def export(tag, silent=False, skip_docs=False):
         os.mkdir("src")
         tarball(archivename, tag.committed_at.strftime("%Y-%m-%d %H:%M:%SZ"))
     print()
-    print("**Now extract the archives in %s/src and run the tests**" % tag.text)
+    print(f"**Now extract the archives in {tag.text}/src and run the tests**")
     print("**You may also want to run make install and re-test**")
 
 
@@ -469,16 +469,16 @@ def build_docs():
 
 def upload(tag, username):
     """scp everything to dinsdale"""
-    address = '"%s@dinsdale.python.org:' % username
+    address = f'"{username}@dinsdale.python.org:'
 
     def scp(from_loc, to_loc):
         run_cmd(["scp", from_loc, address + to_loc])
 
     with pushd(tag.text):
         print("Uploading source tarballs")
-        scp("src", "/data/python-releases/%s" % tag.nickname)
+        scp("src", f"/data/python-releases/{tag.nickname}")
         print("Upload doc tarballs")
-        scp("docs", "/data/python-releases/doc/%s" % tag.nickname)
+        scp("docs", f"/data/python-releases/doc/{tag.nickname}")
         print(
             "* Now change the permissions on the tarballs so they are "
             "writable by the webmaster group. *"
@@ -495,7 +495,7 @@ def __init__(self, tag_name):
             tag_name = os.path.basename(os.getcwd())
         result = tag_cre.match(tag_name)
         if result is None:
-            error("tag %s is not valid" % tag_name)
+            error(f"tag {tag_name} is not valid")
         data = list(result.groups())
         if data[3] is None:
             # A final release.

run_release.py

@@ -526,8 +526,8 @@ def sign_source_artifacts(db: DbfilenameShelf) -> None:
         uid = input("Please enter key ID to use for signing: ")
 
     tarballs_path = pathlib.Path(db["git_repo"] / str(db["release"]) / "src")
-    tgz = str(tarballs_path / ("Python-%s.tgz" % db["release"]))
-    xz = str(tarballs_path / ("Python-%s.tar.xz" % db["release"]))
+    tgz = str(tarballs_path / (f"Python-{db['release']}.tgz"))
+    xz = str(tarballs_path / (f"Python-{db['release']}.tar.xz"))
 
     subprocess.check_call(["gpg", "-bas", "-u", uid, tgz])
     subprocess.check_call(["gpg", "-bas", "-u", uid, xz])