Use more f-strings instead of .format

Author: mauritsvanrees

zest/releaser/baserelease.py

@@ -295,7 +295,7 @@ def _insert_changelog_entry(self, message):
             if index == 0:
                 line = f"{prefix} {line}"
             else:
-                line = "{}  {}".format(" " * len(prefix), line)
+                line = f"{' ' * len(prefix)}  {line}"
             lines.append(line)
         lines.append("")
         self.data["history_lines"][insert:insert] = lines
@@ -315,8 +315,8 @@ def _check_nothing_changed(self):
         # printing text with a u'unicode marker' in front...
         pretty_nothing_changed = f'"{nothing_yet}"'
         if not utils.ask(
-            "WARNING: Changelog contains {}. Are you sure you "
-            "want to release?".format(pretty_nothing_changed),
+            f"WARNING: Changelog contains {pretty_nothing_changed}. "
+            "Are you sure you want to release?",
             default=False,
         ):
             logger.info(
@@ -343,11 +343,11 @@ def _check_required(self):
             if text in history_last_release:
                 # Found it, all is fine.
                 return
-        pretty_required = '"{}"'.format('", "'.join(required))
+        pretty_required = '", "'.join(required)
         if not utils.ask(
             "WARNING: Changelog should contain at least one of "
-            "these required strings: {}. Are you sure you "
-            "want to release?".format(pretty_required),
+            f'these required strings: "{pretty_required}". '
+            "Are you sure you want to release?",
             default=False,
         ):
             sys.exit(1)

zest/releaser/bumpversion.py

@@ -88,12 +88,11 @@ def prepare(self):
         """Prepare self.data by asking about new dev version"""
         if self.data["prerelease"]:
             print(
-                "Checking version bump for {} release and {} prerelease.".format(
-                    self.data["release"], self.data["prerelease"]
-                )
+                f"Checking version bump for {self.data['release']} release "
+                f"and {self.data['prerelease']} prerelease."
             )
         else:
-            print("Checking version bump for {} release.".format(self.data["release"]))
+            print(f"Checking version bump for {self.data['release']} release.")
         if not utils.sanity_check(self.vcs):
             logger.critical("Sanity check failed.")
             sys.exit(1)

zest/releaser/prerelease.py

@@ -70,9 +70,7 @@ def prepare(self):
         self._grab_history()
         if self.data["update_history"]:
             # Print changelog for this release.
-            print(
-                "Changelog entries for version {}:\n".format(self.data["new_version"])
-            )
+            print(f"Changelog entries for version {self.data['new_version']}:\n")
             print(self.data.get("history_last_release"))
         # Grab and set new version.
         self._grab_version()

zest/releaser/tests/test_setup.py

@@ -12,7 +12,7 @@
 
 
 def mock_dispatch(*args):
-    print("MOCK twine dispatch {}".format(" ".join(*args)))
+    print(f'MOCK twine dispatch {" ".join(*args)}')
     return True
 
 

zest/releaser/utils.py

@@ -1056,7 +1056,7 @@ def get_list_item(lines):
         prefix = stripped[0]
         # Restore stripped whitespace.
         white = line.find(prefix)
-        unordered_list.append("{}{}".format(" " * white, prefix))
+        unordered_list.append(f'{" " * white}{prefix}')
     # Get sane default.
     best = "-"
     count = 0

zest/releaser/vcs.py

@@ -75,9 +75,7 @@ def __init__(self, reporoot=None):
             self.zest_releaser_config = pypi.ZestReleaserConfig()
 
     def __repr__(self):
-        return "<{} at {} {}>".format(
-            self.__class__.__name__, self.reporoot, self.relative_path_in_repo
-        )
+        return f"<{self.__class__.__name__} at {self.reporoot} {self.relative_path_in_repo}>"
 
     def is_setuptools_helper_package_installed(self):
         try: