lint using pyupgrade

danieleades · branchv · commit 2adc0e0f9342 · 2022-05-28T16:25:20.000-04:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -23,3 +23,10 @@ repos:
           - flake8-bugbear
           - flake8-comprehensions
           - flake8-simplify
+
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v2.29.1
+    hooks:
+      - id: pyupgrade
+        args:
+          - --py37-plus
diff --git a/cleo/_compat.py b/cleo/_compat.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import shlex
 import subprocess
 import sys
diff --git a/cleo/_utils.py b/cleo/_utils.py
@@ -101,4 +101,4 @@ def format_time(secs):  # type: (float) -> str
         if len(fmt) == 2:
             return fmt[1]
 
-        return "{} {}".format(math.ceil(secs / fmt[2]), fmt[1])
+        return f"{math.ceil(secs / fmt[2])} {fmt[1]}"
diff --git a/cleo/color.py b/cleo/color.py
@@ -109,7 +109,7 @@ def _parse_color(self, color: str, background: bool) -> str:
                 color = color[0] * 2 + color[1] * 2 + color[2] * 2
 
             if len(color) != 6:
-                raise ValueException('"{}" is an invalid color'.format(color))
+                raise ValueException(f'"{color}" is an invalid color')
 
             return ("4" if background else "3") + self._convert_hex_color_to_ansi(
                 int(color, 16)
@@ -132,7 +132,7 @@ def _convert_hex_color_to_ansi(self, color: int) -> str:
         if os.getenv("COLORTERM") != "truecolor":
             return str(self._degrade_hex_color_to_ansi(r, g, b))
 
-        return "8;2;{};{};{}".format(r, g, b)
+        return f"8;2;{r};{g};{b}"
 
     def _degrade_hex_color_to_ansi(self, r: int, g: int, b: int) -> int:
         if round(self._get_saturation(r, g, b) / 50) == 0:
diff --git a/cleo/commands/base_command.py b/cleo/commands/base_command.py
@@ -36,7 +36,7 @@ def __init__(self) -> None:
 
         for i, usage in enumerate(self.usages):
             if self.name and usage.find(self.name) != 0:
-                self.usages[i] = "{} {}".format(self.name, usage)
+                self.usages[i] = f"{self.name} {usage}"
 
     @property
     def application(self) -> "Application":
diff --git a/cleo/commands/command.py b/cleo/commands/command.py
@@ -36,7 +36,7 @@ class Command(BaseCommand):
 
     def __init__(self):
         self._io: Optional[IO] = None
-        super(Command, self).__init__()
+        super().__init__()
 
     @property
     def io(self):  # type: () -> IO
@@ -244,7 +244,7 @@ def write(self, text, style=None):
         Useful if you want to use overwrite().
         """
         if style:
-            styled = "<%s>%s</>" % (style, text)
+            styled = f"<{style}>{text}</>"
         else:
             styled = text
 
@@ -260,7 +260,7 @@ def line(
         Write a string as information output.
         """
         if style:
-            styled = "<{}>{}</>".format(style, text)
+            styled = f"<{style}>{text}</>"
         else:
             styled = text
 
@@ -276,7 +276,7 @@ def line_error(
         Write a string as information output to stderr.
         """
         if style:
-            styled = "<%s>%s</>" % (style, text)
+            styled = f"<{style}>{text}</>"
         else:
             styled = text
 
diff --git a/cleo/commands/completions/__init__.py b/cleo/commands/completions/__init__.py
@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-
diff --git a/cleo/commands/completions/templates.py b/cleo/commands/completions/templates.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 BASH_TEMPLATE = """%(function)s()
 {
     local cur script coms opts com
diff --git a/cleo/commands/completions_command.py b/cleo/commands/completions_command.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import hashlib
 import inspect
 import os
@@ -118,7 +116,7 @@ def handle(self):  # type: () -> int
         return 0
 
     def render(self, shell):  # type: (str) -> str
-        return getattr(self, "render_{}".format(shell))()
+        return getattr(self, f"render_{shell}")()
 
     def render_bash(self):  # type: () -> str
         template = TEMPLATES["bash"]
@@ -161,10 +159,7 @@ def render_bash(self):  # type: () -> str
             commands_options[command.name] = command_options
 
         compdefs = "\n".join(
-            [
-                "complete -o default -F {} {}".format(function, alias)
-                for alias in aliases
-            ]
+            [f"complete -o default -F {function} {alias}" for alias in aliases]
         )
 
         commands = sorted(commands)
@@ -176,7 +171,7 @@ def render_bash(self):  # type: () -> str
             options = [self._zsh_describe(opt, None).strip('"') for opt in options]
 
             desc = [
-                "            ({})".format(command),
+                f"            ({command})",
                 '            opts="${{opts}} {}"'.format(" ".join(options)),
                 "            ;;",
             ]
@@ -245,9 +240,7 @@ def render_zsh(self):
 
             commands_options[command.name] = command_options
 
-        compdefs = "\n".join(
-            ["compdef {} {}".format(function, alias) for alias in aliases]
-        )
+        compdefs = "\n".join([f"compdef {function} {alias}" for alias in aliases])
 
         commands = sorted(commands_options.keys())
         command_list = []
@@ -260,7 +253,7 @@ def render_zsh(self):
             ]
 
             desc = [
-                "            ({})".format(command),
+                f"            ({command})",
                 "            opts+=({})".format(" ".join(options)),
                 "            ;;",
             ]
@@ -359,7 +352,7 @@ def render_fish(self):
                 )
             )
 
-            cmds_opts += ["# {}".format(cmd)]
+            cmds_opts += [f"# {cmd}"]
             options = set(commands_options[cmd]).difference(global_options)
             options = sorted(options)
 
diff --git a/cleo/cursor.py b/cleo/cursor.py
@@ -21,32 +21,32 @@ def __init__(self, io: Union[IO, Output], input: Optional[TextIO] = None) -> Non
         self._input = input
 
     def move_up(self, lines: int = 1) -> "Cursor":
-        self._output.write("\x1b[{}A".format(lines))
+        self._output.write(f"\x1b[{lines}A")
 
         return self
 
     def move_down(self, lines: int = 1) -> "Cursor":
-        self._output.write("\x1b[{}B".format(lines))
+        self._output.write(f"\x1b[{lines}B")
 
         return self
 
     def move_right(self, columns: int = 1) -> "Cursor":
-        self._output.write("\x1b[{}C".format(columns))
+        self._output.write(f"\x1b[{columns}C")
 
         return self
 
     def move_left(self, columns: int = 1) -> "Cursor":
-        self._output.write("\x1b[{}D".format(columns))
+        self._output.write(f"\x1b[{columns}D")
 
         return self
 
     def move_to_column(self, column: int) -> "Cursor":
-        self._output.write("\x1b[{}G".format(column))
+        self._output.write(f"\x1b[{column}G")
 
         return self
 
     def move_to_position(self, column: int, row: int) -> "Cursor":
-        self._output.write("\x1b[{};{}H".format(row + 1, column))
+        self._output.write(f"\x1b[{row + 1};{column}H")
 
         return self
 
diff --git a/cleo/descriptors/text_descriptor.py b/cleo/descriptors/text_descriptor.py
@@ -66,8 +66,8 @@ def _describe_option(self, option: Option, **options: Any) -> None:
         )
 
         synopsis = "{}{}".format(
-            "-{}, ".format(option.shortcut) if option.shortcut else "    ",
-            "--{}{}".format(option.name, value),
+            f"-{option.shortcut}, " if option.shortcut else "    ",
+            f"--{option.name}{value}",
         )
 
         spacing_width = total_width - len(synopsis)
@@ -163,7 +163,7 @@ def _describe_application(self, application: Application, **options: Any) -> Non
 
         help_text = application.help
         if help_text:
-            self._write("{}\n\n".format(help_text))
+            self._write(f"{help_text}\n\n")
 
         self._write("<b>Usage:</b>\n")
         self._write("  command [options] [arguments]\n\n")
diff --git a/cleo/exceptions/__init__.py b/cleo/exceptions/__init__.py
@@ -41,7 +41,7 @@ class NoSuchOptionException(CleoException):
 
 class CommandNotFoundException(CleoSimpleException):
     def __init__(self, name: str, commands: Optional[List[str]] = None) -> None:
-        message = 'The command "{}" does not exist.'.format(name)
+        message = f'The command "{name}" does not exist.'
 
         if commands:
             suggested_names = find_similar_names(name, commands)
@@ -59,7 +59,7 @@ def __init__(self, name: str, commands: Optional[List[str]] = None) -> None:
 
 class NamespaceNotFoundException(CleoSimpleException):
     def __init__(self, name: str, namespaces: Optional[List[str]] = None) -> None:
-        message = 'There are no commands in the "{}" namespace.'.format(name)
+        message = f'There are no commands in the "{name}" namespace.'
 
         if namespaces:
             suggested_names = find_similar_names(name, namespaces)
diff --git a/cleo/formatters/formatter.py b/cleo/formatters/formatter.py
@@ -196,9 +196,7 @@ def _apply_current_style(
             prefix = ""
 
         m = re.match(r"(\n)$", text)
-        text = prefix + re.sub(
-            r"([^\n]{{{width}}})\ *".format(width=width), "\\1\n", text
-        )
+        text = prefix + re.sub(rf"([^\n]{{{width}}})\ *", "\\1\n", text)
         text = text.rstrip("\n") + (m.group(1) if m else "")
 
         if not current_line_length and current and current[-1] != "\n":
diff --git a/cleo/io/buffered_io.py b/cleo/io/buffered_io.py
@@ -13,7 +13,7 @@ def __init__(
         decorated: bool = False,
         supports_utf8: bool = True,
     ) -> None:
-        super(BufferedIO, self).__init__(
+        super().__init__(
             input,
             BufferedOutput(decorated=decorated, supports_utf8=supports_utf8),
             BufferedOutput(decorated=decorated, supports_utf8=supports_utf8),
diff --git a/cleo/io/inputs/argv_input.py b/cleo/io/inputs/argv_input.py
@@ -253,7 +253,7 @@ def _parse_argument(self, token: str) -> None:
                     command_name, token
                 )
             else:
-                message = 'No arguments expected, got "{}"'.format(token)
+                message = f'No arguments expected, got "{token}"'
 
             raise RuntimeException(message)
 
diff --git a/cleo/io/inputs/definition.py b/cleo/io/inputs/definition.py
@@ -202,9 +202,9 @@ def synopsis(self, short: bool = False) -> str:
 
                 shortcut = ""
                 if option.shortcut:
-                    shortcut = "-{}|".format(option.shortcut)
+                    shortcut = f"-{option.shortcut}|"
 
-                elements.append("[{}--{}{}]".format(shortcut, option.name, value))
+                elements.append(f"[{shortcut}--{option.name}{value}]")
 
         if elements and self._arguments:
             elements.append("[--]")
diff --git a/cleo/io/inputs/option.py b/cleo/io/inputs/option.py
@@ -93,4 +93,4 @@ def set_default(self, default: Optional[Any] = None) -> None:
         self._default = default
 
     def __repr__(self) -> str:
-        return "Option({})".format(self._name)
+        return f"Option({self._name})"
diff --git a/cleo/io/inputs/token_parser.py b/cleo/io/inputs/token_parser.py
@@ -96,9 +96,9 @@ def _parse_quoted_string(self) -> str:
             if self._current == "\\":
                 string += self._parse_escape_sequence()
             elif self._current == '"':
-                string += '"{}"'.format(self._parse_quoted_string())
+                string += f'"{self._parse_quoted_string()}"'
             elif self._current == "'":
-                string += "'{}'".format(self._parse_quoted_string())
+                string += f"'{self._parse_quoted_string()}'"
             else:
                 string += self._current
                 self._next()
diff --git a/cleo/io/outputs/section_output.py b/cleo/io/outputs/section_output.py
@@ -96,7 +96,7 @@ def _pop_stream_content_until_current_section(
 
         if lines_to_clear_count > 0:
             # Move cursor up n lines
-            super()._write("\x1b[{}A".format(lines_to_clear_count), new_line=False)
+            super()._write(f"\x1b[{lines_to_clear_count}A", new_line=False)
             # Erase to end of screen
             super()._write("\x1b[0J", new_line=False)
 
diff --git a/cleo/ui/choice_question.py b/cleo/ui/choice_question.py
@@ -89,7 +89,7 @@ class ChoiceQuestion(Question):
     def __init__(
         self, question: str, choices: List[str], default: Optional[Any] = None
     ) -> None:
-        super(ChoiceQuestion, self).__init__(question, default)
+        super().__init__(question, default)
 
         self._multi_select = False
         self._choices = choices
@@ -123,7 +123,7 @@ def _write_prompt(self, io: IO) -> None:
         default = self._default
 
         if default is None:
-            message = "<question>{}</question>: ".format(message)
+            message = f"<question>{message}</question>: "
         elif self._multi_select:
             choices = self._choices
             default = default.split(",")
diff --git a/cleo/ui/confirmation_question.py b/cleo/ui/confirmation_question.py
@@ -15,7 +15,7 @@ class ConfirmationQuestion(Question):
     def __init__(
         self, question: str, default: bool = True, true_answer_regex: str = "(?i)^y"
     ) -> None:
-        super(ConfirmationQuestion, self).__init__(question, default)
+        super().__init__(question, default)
 
         self._true_answer_regex = true_answer_regex
         self._normalizer = self._get_default_normalizer
diff --git a/cleo/ui/exception_trace.py b/cleo/ui/exception_trace.py
@@ -107,7 +107,7 @@ def readline():
                 if current_type is None:
                     current_type = self.TOKEN_DEFAULT
 
-                line += "<{}>{}</>".format(self._theme[current_type], buffer)
+                line += f"<{self._theme[current_type]}>{buffer}</>"
                 lines.append(line)
                 break
 
@@ -154,19 +154,17 @@ def readline():
                 buffer += token_info.line[current_col : start[1]]
 
             if current_type != new_type:
-                line += "<{}>{}</>".format(self._theme[current_type], buffer)
+                line += f"<{self._theme[current_type]}>{buffer}</>"
                 buffer = ""
                 current_type = new_type
 
             if lineno < end[0]:
                 # The token spans multiple lines
                 token_lines = token_string.split("\n")
-                line += "<{}>{}</>".format(self._theme[current_type], token_lines[0])
+                line += f"<{self._theme[current_type]}>{token_lines[0]}</>"
                 lines.append(line)
                 for token_line in token_lines[1:-1]:
-                    lines.append(
-                        "<{}>{}</>".format(self._theme[current_type], token_line)
-                    )
+                    lines.append(f"<{self._theme[current_type]}>{token_line}</>")
 
                 current_line = end[0]
                 buffer = token_lines[-1][: end[1]]
@@ -254,7 +252,7 @@ def ignore_files_in(self, ignore: str) -> "ExceptionTrace":
     def render(self, io: Union[IO, Output], simple: bool = False) -> None:
         if simple:
             io.write_line("")
-            io.write_line("<error>{}</error>".format(str(self._exception)))
+            io.write_line(f"<error>{str(self._exception)}</error>")
             return
 
         return self._render_exception(io, self._exception)
@@ -276,14 +274,12 @@ def _render_exception(self, io: Union[IO, Output], exception: Exception) -> None
 
         self._render_trace(io, inspector.frames)
 
-        self._render_line(
-            io, "<error>{}</error>".format(inspector.exception_name), True
-        )
+        self._render_line(io, f"<error>{inspector.exception_name}</error>", True)
         io.write_line("")
         exception_message = (
             Formatter().format(inspector.exception_message).replace("\n", "\n  ")
         )
-        self._render_line(io, "<b>{}</b>".format(exception_message))
+        self._render_line(io, f"<b>{exception_message}</b>")
 
         current_frame = inspector.frames[-1]
         self._render_snippet(io, current_frame)
@@ -332,7 +328,7 @@ def _render_solution(self, io: Union[IO, Output], inspector: Inspector):
                     symbol,
                     title.rstrip("."),
                     description,
-                    ",".join("\n    <fg=blue>{}</>".format(link) for link in links),
+                    ",".join(f"\n    <fg=blue>{link}</>" for link in links),
                 ),
                 True,
             )
diff --git a/cleo/ui/progress_bar.py b/cleo/ui/progress_bar.py
diff --git a/cleo/ui/progress_indicator.py b/cleo/ui/progress_indicator.py
diff --git a/cleo/ui/question.py b/cleo/ui/question.py
diff --git a/docs/conf.py b/docs/conf.py
diff --git a/tests/commands/__init__.py b/tests/commands/__init__.py
diff --git a/tests/commands/completion/__init__.py b/tests/commands/completion/__init__.py
diff --git a/tests/commands/completion/fixtures/__init__.py b/tests/commands/completion/fixtures/__init__.py
diff --git a/tests/commands/completion/test_completions_command.py b/tests/commands/completion/test_completions_command.py
diff --git a/tests/testers/__init__.py b/tests/testers/__init__.py
diff --git a/tests/ui/test_exception_trace.py b/tests/ui/test_exception_trace.py

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`		`-`
`3`	`1`	`import shlex`
`4`	`2`	`import subprocess`
`5`	`3`	`import sys`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`		`-`
`3`	`1`	`BASH_TEMPLATE = """%(function)s()`
`4`	`2`	`{`
`5`	`3`	`local cur script coms opts com`