ruff: Fix UP032 Use f-string instead of format call.

Signed-off-by: Anders Kaseorg <[email protected]>

Author: andersk

tools/deploy

@@ -55,11 +55,11 @@ def pack(options: argparse.Namespace) -> None:
     zip_file.write(options.config, "zuliprc")
     # Pack the config file for the botfarm.
     bot_config = textwrap.dedent(
-        """\
+        f"""\
         [deploy]
-        bot={}
+        bot={options.main}
         zuliprc=zuliprc
-        """.format(options.main)
+        """
     )
     zip_file.writestr("config.ini", bot_config)
     zip_file.close()

tools/provision

@@ -58,12 +58,10 @@ the Python version this command is executed with."""
             return_code = subprocess.call([options.python_interpreter, "-m", "venv", venv_dir])
         except OSError:
             print(
-                "{red}Installation with venv failed. Probable errors are: "
+                f"{red}Installation with venv failed. Probable errors are: "
                 "You are on Ubuntu and you haven't installed python3-venv,"
                 "or you are running an unsupported python version"
-                "or python is not installed properly{end_format}".format(
-                    red=red, end_format=end_format
-                )
+                f"or python is not installed properly{end_format}"
             )
             sys.exit(1)
             raise

zulip/integrations/bridge_with_irc/irc-mirror.py

@@ -47,7 +47,7 @@
         traceback.print_exc()
         print(
             "You have unsatisfied dependencies. Install all missing dependencies with "
-            "{} --provision".format(sys.argv[0])
+            f"{sys.argv[0]} --provision"
         )
         sys.exit(1)
 

zulip/integrations/bridge_with_matrix/test_matrix.py

@@ -118,11 +118,7 @@ def test_write_sample_config_from_zuliprc(self) -> None:
             )
             self.assertEqual(
                 output_lines,
-                [
-                    "Wrote sample configuration to '{}' using zuliprc file '{}'".format(
-                        path, zuliprc_path
-                    )
-                ],
+                [f"Wrote sample configuration to '{path}' using zuliprc file '{zuliprc_path}'"],
             )
 
             with open(path) as sample_file:
@@ -143,11 +139,7 @@ def test_detect_zuliprc_does_not_exist(self) -> None:
             )
             self.assertEqual(
                 output_lines,
-                [
-                    "Could not write sample config: Zuliprc file '{}' does not exist.".format(
-                        zuliprc_path
-                    )
-                ],
+                [f"Could not write sample config: Zuliprc file '{zuliprc_path}' does not exist."],
             )
 
     def test_parse_multiple_bridges(self) -> None:

zulip/integrations/codebase/zulip_codebase_mirror

@@ -173,10 +173,7 @@ def handle_event(event: Dict[str, Any]) -> None:
 
         if "status_id" in changes:
             status_change = changes.get("status_id")
-            content += "Status changed from **{}** to **{}**\n\n".format(
-                status_change[0],
-                status_change[1],
-            )
+            content += f"Status changed from **{status_change[0]}** to **{status_change[1]}**\n\n"
     elif event_type == "ticketing_milestone":
         stream = config.ZULIP_TICKETS_STREAM_NAME
 
@@ -199,12 +196,7 @@ def handle_event(event: Dict[str, Any]) -> None:
             url = make_url(f"projects/{project_link}/repositories/{repo_link}/commit/{commit}")
 
             subject = f"{actor_name} commented on {commit}"
-            content = "{} commented on [{}]({}):\n\n~~~ quote\n{}".format(
-                actor_name,
-                commit,
-                url,
-                comment,
-            )
+            content = f"{actor_name} commented on [{commit}]({url}):\n\n~~~ quote\n{comment}"
         else:
             # Otherwise, this is a Discussion item, and handle it
             subj = raw_props.get("subject")

zulip/integrations/hg/zulip_changegroup.py

@@ -30,18 +30,12 @@ def format_summary_line(
 
     if web_url:
         shortlog_base_url = web_url.rstrip("/") + "/shortlog/"
-        summary_url = "{shortlog}{tip}?revcount={revcount}".format(
-            shortlog=shortlog_base_url, tip=tip - 1, revcount=revcount
-        )
-        formatted_commit_count = "[{revcount} commit{s}]({url})".format(
-            revcount=revcount, s=plural, url=summary_url
-        )
+        summary_url = f"{shortlog_base_url}{tip - 1}?revcount={revcount}"
+        formatted_commit_count = f"[{revcount} commit{plural}]({summary_url})"
     else:
         formatted_commit_count = f"{revcount} commit{plural}"
 
-    return "**{user}** pushed {commits} to **{branch}** (`{tip}:{node}`):\n\n".format(
-        user=user, commits=formatted_commit_count, branch=branch, tip=tip, node=node[:12]
-    )
+    return f"**{user}** pushed {formatted_commit_count} to **{branch}** (`{tip}:{node[:12]}`):\n\n"
 
 
 def format_commit_lines(web_url: str, repo: repo, base: int, tip: int) -> str:

zulip/integrations/perforce/zulip_change-commit.py

@@ -77,7 +77,7 @@
 
 if p4web is not None:
     # linkify the change number
-    change = "[{change}]({p4web}/{change}?ac=10)".format(p4web=p4web, change=change)
+    change = f"[{change}]({p4web}/{change}?ac=10)"
 
 message = """**{user}** committed revision @{change} to `{path}`.
 

zulip/integrations/rss/rss-bot

@@ -177,12 +177,7 @@ def send_zulip(entry: Any, feed_name: str) -> Dict[str, Any]:
     if opts.unwrap:
         body = unwrap_text(body)
 
-    content = "**[{}]({})**\n{}\n{}".format(
-        entry.title,
-        entry.link,
-        strip_tags(body),
-        entry.link,
-    )
+    content = f"**[{entry.title}]({entry.link})**\n{strip_tags(body)}\n{entry.link}"
 
     if opts.math:
         content = content.replace("$", "$$")

zulip/integrations/zephyr/zephyr_mirror_backend.py

@@ -793,9 +793,7 @@ def forward_to_zephyr(message: Dict[str, Any], zulip_client: zulip.Client) -> No
             # Forward messages sent to '(instance "WHITESPACE")' back to the
             # appropriate WHITESPACE instance for bidirectional mirroring
             instance = match_whitespace_instance.group(1)
-        elif instance == f"instance {zephyr_class}" or instance == "test instance {}".format(
-            zephyr_class,
-        ):
+        elif instance == f"instance {zephyr_class}" or instance == f"test instance {zephyr_class}":
             # Forward messages to e.g. -c -i white-magic back from the
             # place we forward them to
             if instance.startswith("test"):

zulip/tests/test_default_arguments.py

@@ -41,9 +41,7 @@ def test_config_path_with_tilde(self, mock_os_path_exists: bool) -> None:
         expanded_test_path = os.path.abspath(os.path.expanduser(test_path))
         self.assertEqual(
             str(cm.exception),
-            "api_key or email not specified and " "file {} does not exist".format(
-                expanded_test_path
-            ),
+            "api_key or email not specified and " f"file {expanded_test_path} does not exist",
         )