more usage of f-strings

Author: fchapoton

sage_patchbot/http_post_file.py

@@ -66,20 +66,20 @@ def encode_multipart_formdata(fields, files):
         fields = fields.items()
     for (key, value) in fields:
         L.append(dd + BOUNDARY)
-        L.append(by('Content-Disposition: form-data; name="{}"'.format(key)))
+        L.append(by(f'Content-Disposition: form-data; name="{key}"'))
         L.append(by(''))
         L.append(by(value))
     for (key, filename, value) in files:
         L.append(dd + BOUNDARY)
-        cont = 'Content-Disposition: form-data; name="{}"; filename="{}"'
-        L.append(by(cont.format(key, filename)))
-        L.append(by('Content-Type: {}'.format(get_content_type(filename))))
+        cont = f'Content-Disposition: form-data; name="{key}"; filename="{filename}"'
+        L.append(by(cont))
+        L.append(by(f'Content-Type: {get_content_type(filename)}'))
         L.append(by(''))
         L.append(value)   # here are bytes ??
     L.append(dd + BOUNDARY + dd)
     L.append(by(''))
     body: bytes = CRLF.join(L)
-    content_type = 'multipart/form-data; boundary={}'.format(UTF_BOUNDARY)
+    content_type = f'multipart/form-data; boundary={UTF_BOUNDARY}'
     return content_type, body
 
 

sage_patchbot/server/serve.py

@@ -385,7 +385,7 @@ def format_git_describe(res):
         if res:
             if '-' in res:
                 tag, commits = res.split('-')[:2]
-                return "%s + %s commits" % (tag, commits)
+                return f"{tag} + {commits} commits"
             if 'commits' in res:
                 # old style
                 return res
@@ -409,7 +409,7 @@ def preprocess_reports(all_t):
             if 'git_commit_human' not in item:
                 item['git_commit_human'] = "%s new commits" % len(item['log'])
             for x in ('commit', 'base', 'merge'):
-                field = 'git_%s_human' % x
+                field = f'git_{x}_human'
                 item[field] = format_git_describe(item.get(field, None))
             item['machine'] = band_aid_for_machine(item['machine'])
             if chosen_base in ('all', base_of_this_report):

sage_patchbot/trac.py

@@ -102,7 +102,7 @@ def get_ticket_info_from_trac_server(ticket_id: int) -> dict[str, Any]:
     authors_fullnames = list(set_authors_fullnames)
 
     # needed to extract the participants
-    rss = get_url("{}/ticket/{}?format=rss".format(TRAC_URL, ticket_id))
+    rss = get_url(f"{TRAC_URL}/ticket/{ticket_id}?format=rss")
 
     return {'id': ticket_id,
             'title': trac_info.title,
@@ -272,7 +272,7 @@ def inplace_safe():
                          "src/bin/sage-banner",
                          "src/bin/sage-version.sh")):
             continue
-        msg = "Unsafe file: {}".format(file)
+        msg = f"Unsafe file: {file}"
         print(msg)
         return False
     return True
@@ -312,9 +312,9 @@ def pull_from_trac(sage_root, ticket_id, branch=None, force=None,
             return
         branch = info['git_branch']
         repo = info['git_repo']
-        do_or_die("git fetch %s +%s:patchbot/ticket_upstream" % (repo, branch))
+        do_or_die(f"git fetch {repo} +{branch}:patchbot/ticket_upstream")
         base = describe_branch('patchbot/ticket_upstream', tag_only=True)
-        do_or_die("git rev-list --left-right --count %s..patchbot/ticket_upstream" % base)
+        do_or_die(f"git rev-list --left-right --count {base}..patchbot/ticket_upstream")
         do_or_die("git branch -f patchbot/ticket_merged patchbot/base")
         do_or_die("git checkout patchbot/ticket_merged")
         try:
@@ -331,7 +331,7 @@ def pull_from_trac(sage_root, ticket_id, branch=None, force=None,
             # create temporary dir
             temp_dir = tempfile.mkdtemp(temp_build_suffix + str(ticket_id))
             ensure_free_space(temp_dir)
-            do_or_die("git clone . '{}'".format(temp_dir))
+            do_or_die("git clone . '{temp_dir}'")
             os.chdir(temp_dir)
             os.symlink(os.path.join(sage_root, "upstream"), "upstream")
             os.environ['SAGE_ROOT'] = temp_dir
@@ -429,7 +429,7 @@ def remote_branch(self, ticket_number: int) -> str:
                     pull_from_trac(os.environ['SAGE_ROOT'], tick, force=True)
                 time.sleep(1)
             except Exception:
-                msg = "Error for {}".format(tick)
+                msg = f"Error for {tick}"
                 print(msg)
                 traceback.print_exc()
         force = apply = False

sage_patchbot/trac_ticket.py

@@ -119,11 +119,10 @@ def new(self):
     @property
     def change_action(self) -> str:
         if not self.old:
-            return 'set to {change.new}'.format(change=self)
+            return f'set to {self.new}'
         if not self.new:
-            return '{change.old} deleted'.format(change=self)
-        txt = 'changed from {change.old} to {change.new}'
-        return txt.format(change=self)
+            return f'{self.old} deleted'
+        return f'changed from {self.old} to {self.new}'
 
     def __repr__(self) -> str:
         txt = self._author + ' changed ' + self._change

sage_patchbot/util.py

@@ -145,10 +145,10 @@ def git_commit(repo: str, branch: str) -> str | None:
         In [16]: git_commit('/home/marlon_brando/sage', 'develop')
         Out[16]: '7eb8510dacf61b691664cd8f1d2e75e5d473e5a0'
     """
-    ref = "refs/heads/{}".format(branch)
+    ref = f"refs/heads/{branch}"
     try:
         res = subprocess.check_output(["git",
-                                       "--git-dir={}/.git".format(repo),
+                                       f"--git-dir={repo}/.git",
                                        "show-ref",
                                        "--verify", ref],
                                       universal_newlines=True)
@@ -168,7 +168,7 @@ def branch_updates_some_package() -> bool:
         if not file:
             continue
         if file.startswith("build/pkgs") and file.endswith("checksums.ini"):
-            msg = "Modified package: {}".format(file)
+            msg = f"Modified package: {file}"
             print(msg)
             return True
     return False
@@ -200,7 +200,7 @@ def do_or_die(cmd: str, exn_class=Exception):
     print(cmd)
     res = os.system(cmd)
     if res:
-        raise exn_class("{} {}".format(res, cmd))
+        raise exn_class(f"{res} {cmd}")
 
 
 def comparable_version(version: str) -> list[tuple]: