fix: clean up some things pyupgrade got wrong

Implements the reviews from #3987 and #3988. Special thanks to the
committers and reviewers there.

Co-authored-by: Harry Peach <harrypeach1999@gmail.com>
Co-authored-by: Kamyar Ghasemlou <kamyar@kamy.me>
Co-authored-by: Leonardo Freua <leonardo.batista.freua@gmail.com>

src/poetry/console/commands/env/info.py

@@ -39,21 +39,13 @@ class EnvInfoCommand(Command):
         self.line("<b>Virtualenv</b>")
         listing = [
             f"<info>Python</info>:         <comment>{env_python_version}</>",
-            "<info>Implementation</info>: <comment>{}</>".format(
-                env.python_implementation
-            ),
-            "<info>Path</info>:           <comment>{}</>".format(
-                env.path if env.is_venv() else "NA"
-            ),
-            "<info>Executable</info>:     <comment>{}</>".format(
-                env.python if env.is_venv() else "NA"
-            ),
+            f"<info>Implementation</info>: <comment>{env.python_implementation}</>",
+            f"<info>Path</info>:           <comment>{env.path if env.is_venv() else 'NA'}</>",
+            f"<info>Executable</info>:     <comment>{env.python if env.is_venv() else 'NA'}</>",
         ]
         if env.is_venv():
             listing.append(
-                "<info>Valid</info>:          <{tag}>{is_valid}</{tag}>".format(
-                    tag="comment" if env.is_sane() else "error", is_valid=env.is_sane()
-                )
+                f"<info>Valid</info>:          <{'comment' if env.is_sane() else 'error'}>{env.is_sane()}</>"
             )
         self.line("\n".join(listing))
 

src/poetry/console/commands/version.py

@@ -55,7 +55,7 @@ patch, minor, major, prepatch, preminor, premajor, prerelease.
             )
 
             if self.option("short"):
-                self.line(f"{version}")
+                self.line(version.to_string())
             else:
                 self.line(
                     "Bumping version from <b>{}</> to <fg=green>{}</>".format(
@@ -70,12 +70,10 @@ patch, minor, major, prepatch, preminor, premajor, prerelease.
             self.poetry.file.write(content)
         else:
             if self.option("short"):
-                self.line(f"{self.poetry.package.pretty_version}")
+                self.line(self.poetry.package.pretty_version)
             else:
                 self.line(
-                    "<comment>{}</> <info>{}</>".format(
-                        self.poetry.package.name, self.poetry.package.pretty_version
-                    )
+                    f"<comment>{self.poetry.package.name}</> <info>{self.poetry.package.pretty_version}</>"
                 )
 
     def increment_version(self, version: str, rule: str) -> "Version":

tests/console/commands/env/test_remove.py

@@ -22,7 +22,7 @@ def test_remove_by_python_version(
     assert check_output.called
     assert not (venv_cache / f"{venv_name}-py3.6").exists()
 
-    expected = "Deleted virtualenv: {}\n".format(venv_cache / f"{venv_name}-py3.6")
+    expected = f"Deleted virtualenv: {venv_cache / venv_name}-py3.6\n"
     assert expected == tester.io.fetch_output()
 
 

tests/console/commands/test_init.py

@@ -714,4 +714,4 @@ build-backend = "setuptools.build_meta"
         tester.io.fetch_output().strip()
         == "A pyproject.toml file with a defined build-system already exists."
     )
-    assert f"{existing_section}" in pyproject_file.read_text()
+    assert existing_section in pyproject_file.read_text()