Use str.format and f-strings where possible

sebastinas · sebastinas · commit 3b83c0206611 · 2020-10-13T21:25:42.000+02:00
diff --git a/bpython/args.py b/bpython/args.py
@@ -24,7 +24,7 @@ def error(self, msg):
 
 
 def version_banner():
-    return "bpython version %s on top of Python %s %s" % (
+    return "bpython version {} on top of Python {} {}".format(
         __version__,
         sys.version.split()[0],
         sys.executable,
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -351,7 +351,7 @@ def attr_lookup(self, obj, expr, attr):
         n = len(attr)
         for word in words:
             if self.method_match(word, n, attr) and word != "__builtins__":
-                matches.append("%s.%s" % (expr, word))
+                matches.append(f"{expr}.{word}")
         return matches
 
     def list_attributes(self, obj):
@@ -377,7 +377,7 @@ def matches(self, cursor_offset, line, **kwargs):
             return None
         if isinstance(obj, dict) and obj.keys():
             matches = {
-                "{0!r}]".format(k)
+                f"{k!r}]"
                 for k in obj.keys()
                 if repr(k).startswith(r.word)
             }
@@ -562,7 +562,7 @@ def matches(self, cursor_offset, line, **kwargs):
             history = kwargs["history"]
 
             if "\n" in current_block:
-                assert cursor_offset <= len(line), "%r %r" % (
+                assert cursor_offset <= len(line), "{!r} {!r}".format(
                     cursor_offset,
                     line,
                 )
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -773,7 +773,7 @@ def mkargspec(self, topline, in_arg, down):
             if args:
                 self.list_win.addstr(", ", punctuation_colpair)
             self.list_win.addstr(
-                "*%s" % (_args,), get_colpair(self.config, "token")
+                f"*{_args}", get_colpair(self.config, "token")
             )
 
         if kwonly:
@@ -799,7 +799,7 @@ def mkargspec(self, topline, in_arg, down):
             if args or _args or kwonly:
                 self.list_win.addstr(", ", punctuation_colpair)
             self.list_win.addstr(
-                "**%s" % (_kwargs,), get_colpair(self.config, "token")
+                f"**{_kwargs}", get_colpair(self.config, "token")
             )
         self.list_win.addstr(")", punctuation_colpair)
 
@@ -978,7 +978,7 @@ def p_key(self, key):
             try:
                 source = self.get_source_of_current_name()
             except repl.SourceNotFound as e:
-                self.statusbar.message("%s" % (e,))
+                self.statusbar.message(f"{e}")
             else:
                 if config.highlight_show_source:
                     source = format(
@@ -1072,7 +1072,7 @@ def prompt(self, more):
         """Show the appropriate Python prompt"""
         if not more:
             self.echo(
-                "\x01%s\x03%s" % (self.config.color_scheme["prompt"], self.ps1)
+                "\x01{}\x03{}".format(self.config.color_scheme["prompt"], self.ps1)
             )
             self.stdout_hist += self.ps1
             self.screen_hist.append(
@@ -1081,10 +1081,10 @@ def prompt(self, more):
             )
         else:
             prompt_more_color = self.config.color_scheme["prompt_more"]
-            self.echo("\x01%s\x03%s" % (prompt_more_color, self.ps2))
+            self.echo(f"\x01{prompt_more_color}\x03{self.ps2}")
             self.stdout_hist += self.ps2
             self.screen_hist.append(
-                "\x01%s\x03%s\x04" % (prompt_more_color, self.ps2)
+                f"\x01{prompt_more_color}\x03{self.ps2}\x04"
             )
 
     def push(self, s, insert_into_history=True):
@@ -1480,7 +1480,7 @@ def undo(self, n=1):
     def writetb(self, lines):
         for line in lines:
             self.write(
-                "\x01%s\x03%s" % (self.config.color_scheme["error"], line)
+                "\x01{}\x03{}".format(self.config.color_scheme["error"], line)
             )
 
     def yank_from_buffer(self):
@@ -1700,7 +1700,7 @@ def init_wins(scr, config):
     )
 
     message = "  ".join(
-        "<%s> %s" % (key, command) for command, key in commands if key
+        f"<{key}> {command}" for command, key in commands if key
     )
 
     statusbar = Statusbar(
diff --git a/bpython/config.py b/bpython/config.py
@@ -48,7 +48,7 @@ def fill_config_with_default_values(config, default_values):
 
         for (opt, val) in default_values[section].items():
             if not config.has_option(section, opt):
-                config.set(section, opt, "%s" % (val,))
+                config.set(section, opt, f"{val}")
 
 
 def loadini(struct, configfile):
@@ -270,7 +270,7 @@ def get_key_no_doublebind(command):
             load_theme(struct, path, struct.color_scheme, default_colors)
         except EnvironmentError:
             sys.stderr.write(
-                "Could not load theme '%s'.\n" % (color_scheme_name,)
+                f"Could not load theme '{color_scheme_name}'.\n"
             )
             sys.exit(1)
 
diff --git a/bpython/curtsiesfrontend/filewatch.py b/bpython/curtsiesfrontend/filewatch.py
@@ -58,7 +58,7 @@ def track_module(self, path):
 
         def activate(self):
             if self.activated:
-                raise ValueError("%r is already activated." % (self,))
+                raise ValueError(f"{self!r} is already activated.")
             if not self.started:
                 self.started = True
                 self.observer.start()
@@ -71,7 +71,7 @@ def activate(self):
 
         def deactivate(self):
             if not self.activated:
-                raise ValueError("%r is not activated." % (self,))
+                raise ValueError(f"{self!r} is not activated.")
             self.observer.unschedule_all()
             self.activated = False
 
diff --git a/bpython/curtsiesfrontend/interpreter.py b/bpython/curtsiesfrontend/interpreter.py
@@ -45,7 +45,7 @@ class BPythonFormatter(Formatter):
     def __init__(self, color_scheme, **options):
         self.f_strings = {}
         for k, v in color_scheme.items():
-            self.f_strings[k] = "\x01%s" % (v,)
+            self.f_strings[k] = f"\x01{v}"
         super().__init__(**options)
 
     def format(self, tokensource, outfile):
@@ -54,7 +54,7 @@ def format(self, tokensource, outfile):
         for token, text in tokensource:
             while token not in self.f_strings:
                 token = token.parent
-            o += "%s\x03%s\x04" % (self.f_strings[token], text)
+            o += "{}\x03{}\x04".format(self.f_strings[token], text)
         outfile.write(parse(o.rstrip()))
 
 
diff --git a/bpython/curtsiesfrontend/manual_readline.py b/bpython/curtsiesfrontend/manual_readline.py
@@ -35,7 +35,7 @@ def add(self, key, func, overwrite=False):
             if overwrite:
                 del self[key]
             else:
-                raise ValueError("key %r already has a mapping" % (key,))
+                raise ValueError(f"key {key!r} already has a mapping")
         params = getargspec(func)
         args = {
             k: v for k, v in self.default_kwargs.items() if k in params
@@ -57,13 +57,13 @@ def add(self, key, func, overwrite=False):
             self.cut_buffer_edits[key] = func
         else:
             raise ValueError(
-                "return type of function %r not recognized" % (func,)
+                f"return type of function {func!r} not recognized"
             )
 
     def add_config_attr(self, config_attr, func):
         if config_attr in self.awaiting_config:
             raise ValueError(
-                "config attribute %r already has a mapping" % (config_attr,)
+                f"config attribute {config_attr!r} already has a mapping"
             )
         self.awaiting_config[config_attr] = func
 
@@ -84,15 +84,15 @@ def __getitem__(self, key):
             return self.simple_edits[key]
         if key in self.cut_buffer_edits:
             return self.cut_buffer_edits[key]
-        raise KeyError("key %r not mapped" % (key,))
+        raise KeyError(f"key {key!r} not mapped")
 
     def __delitem__(self, key):
         if key in self.simple_edits:
             del self.simple_edits[key]
         elif key in self.cut_buffer_edits:
             del self.cut_buffer_edits[key]
         else:
-            raise KeyError("key %r not mapped" % (key,))
+            raise KeyError(f"key {key!r} not mapped")
 
 
 class UnconfiguredEdits(AbstractEdits):
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -1350,13 +1350,13 @@ def display_line_with_prompt(self):
         if self.incr_search_mode == "reverse_incremental_search":
             return (
                 prompt(
-                    "(reverse-i-search)`{}': ".format(self.incr_search_target)
+                    f"(reverse-i-search)`{self.incr_search_target}': "
                 )
                 + self.current_line_formatted
             )
         elif self.incr_search_mode == "incremental_search":
             return (
-                prompt("(i-search)`%s': ".format(self.incr_search_target))
+                prompt(f"(i-search)`%s': ")
                 + self.current_line_formatted
             )
         return (
@@ -1976,7 +1976,7 @@ def show_source(self):
         try:
             source = self.get_source_of_current_name()
         except SourceNotFound as e:
-            self.status_bar.message("%s" % (e,))
+            self.status_bar.message(f"{e}")
         else:
             if self.config.highlight_show_source:
                 source = pygformat(
@@ -2028,7 +2028,7 @@ def key_help_text(self):
 
         max_func = max(len(func) for func, key in pairs)
         return "\n".join(
-            "%s : %s" % (func.rjust(max_func), key) for func, key in pairs
+            "{} : {}".format(func.rjust(max_func), key) for func, key in pairs
         )
 
 
diff --git a/bpython/curtsiesfrontend/replpainter.py b/bpython/curtsiesfrontend/replpainter.py
@@ -133,7 +133,7 @@ def formatted_argspec(funcprops, arg_pos, columns, config):
     if _args:
         if args:
             s += punctuation_color(", ")
-        s += token_color("*%s" % (_args,))
+        s += token_color(f"*{_args}")
 
     if kwonly:
         if not _args:
@@ -155,7 +155,7 @@ def formatted_argspec(funcprops, arg_pos, columns, config):
     if _kwargs:
         if args or _args or kwonly:
             s += punctuation_color(", ")
-        s += token_color("**%s" % (_kwargs,))
+        s += token_color(f"**{_kwargs}")
     s += punctuation_color(")")
 
     return linesplit(s, columns)
diff --git a/bpython/formatter.py b/bpython/formatter.py
@@ -99,7 +99,7 @@ class BPythonFormatter(Formatter):
     def __init__(self, color_scheme, **options):
         self.f_strings = {}
         for k, v in theme_map.items():
-            self.f_strings[k] = "\x01%s" % (color_scheme[v],)
+            self.f_strings[k] = "\x01{}".format(color_scheme[v])
             if k is Parenthesis:
                 # FIXME: Find a way to make this the inverse of the current
                 # background colour
@@ -114,7 +114,7 @@ def format(self, tokensource, outfile):
 
             while token not in self.f_strings:
                 token = token.parent
-            o += "%s\x03%s\x04" % (self.f_strings[token], text)
+            o += "{}\x03{}\x04".format(self.f_strings[token], text)
         outfile.write(o.rstrip())
 
 
diff --git a/bpython/importcompletion.py b/bpython/importcompletion.py
@@ -49,7 +49,7 @@
 
 def module_matches(cw, prefix=""):
     """Modules names to replace cw with"""
-    full = "%s.%s" % (prefix, cw) if prefix else cw
+    full = f"{prefix}.{cw}" if prefix else cw
     matches = (
         name
         for name in modules
@@ -63,7 +63,7 @@ def module_matches(cw, prefix=""):
 
 def attr_matches(cw, prefix="", only_modules=False):
     """Attributes to replace name with"""
-    full = "%s.%s" % (prefix, cw) if prefix else cw
+    full = f"{prefix}.{cw}" if prefix else cw
     module_name, _, name_after_dot = full.rpartition(".")
     if module_name not in sys.modules:
         return set()
@@ -73,15 +73,15 @@ def attr_matches(cw, prefix="", only_modules=False):
             name
             for name in dir(module)
             if name.startswith(name_after_dot)
-            and "%s.%s" % (module_name, name) in sys.modules
+            and f"{module_name}.{name}" in sys.modules
         }
     else:
         matches = {
             name for name in dir(module) if name.startswith(name_after_dot)
         }
     module_part, _, _ = cw.rpartition(".")
     if module_part:
-        matches = {"%s.%s" % (module_part, m) for m in matches}
+        matches = {f"{module_part}.{m}" for m in matches}
 
     return matches
 
@@ -185,7 +185,7 @@ def find_modules(path):
                     paths.add(path_real)
                     for subname in find_modules(pathname):
                         if subname != "__init__":
-                            yield "%s.%s" % (name, subname)
+                            yield f"{name}.{subname}"
             yield name
 
 
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -812,7 +812,7 @@ def process():
                     elif line.startswith(self.ps2):	
                         yield line[len(self.ps2) :]	
                     elif line.rstrip():	        
-                        yield "# OUT: %s" % (line,)
+                        yield f"# OUT: {line}"
             return '\n'.join(process())
 
     def write2file(self):
diff --git a/bpython/simpleeval.py b/bpython/simpleeval.py
@@ -171,7 +171,7 @@ def _convert(node):
             attr = node.attr
             return getattr_safe(obj, attr)
 
-        raise ValueError("malformed node or string: {!r}".format(node))
+        raise ValueError(f"malformed node or string: {node!r}")
 
     return _convert(node_or_string)
 
@@ -182,8 +182,8 @@ def safe_getitem(obj, index):
         try:
             return obj[index]
         except (KeyError, IndexError):
-            raise EvaluationError("can't lookup key %r on %r" % (index, obj))
-    raise ValueError("unsafe to lookup on object of type %s" % (type(obj),))
+            raise EvaluationError(f"can't lookup key {index!r} on {obj!r}")
+    raise ValueError("unsafe to lookup on object of type {}".format(type(obj)))
 
 
 def find_attribute_with_name(node, name):
@@ -255,5 +255,5 @@ def evaluate_current_attribute(cursor_offset, line, namespace=None):
         return getattr(obj, attr.word)
     except AttributeError:
         raise EvaluationError(
-            "can't lookup attribute %s on %r" % (attr.word, obj)
+            f"can't lookup attribute {attr.word} on {obj!r}"
         )
diff --git a/bpython/simplerepl.py b/bpython/simplerepl.py
@@ -51,7 +51,7 @@ def _schedule_refresh(self, when="now"):
             self.request_refresh()
         else:
             dt = round(when - time.time(), 1)
-            self.out("please refresh in {} seconds".format(dt))
+            self.out(f"please refresh in {dt} seconds")
 
     def _request_reload(self, files_modified=("?",)):
         e = bpythonevents.ReloadEvent()
diff --git a/bpython/test/__init__.py b/bpython/test/__init__.py
@@ -19,7 +19,7 @@ class MagicIterMock(mock.MagicMock):
 
 def builtin_target(obj):
     """Returns mock target string of a builtin"""
-    return "%s.%s" % (builtins.__name__, obj.__name__)
+    return f"{builtins.__name__}.{obj.__name__}"
 
 
 TEST_CONFIG = os.path.join(os.path.dirname(__file__), "test.config")
diff --git a/bpython/test/test_curtsies_painting.py b/bpython/test/test_curtsies_painting.py
@@ -185,7 +185,7 @@ def test_nonsense_docstrings(self):
                     docstring, 40, config=setup_config()
                 )
             except Exception:
-                self.fail("bad docstring caused crash: {!r}".format(docstring))
+                self.fail(f"bad docstring caused crash: {docstring!r}")
 
     def test_weird_boto_docstrings(self):
         # Boto does something like this.
diff --git a/bpython/test/test_curtsies_repl.py b/bpython/test/test_curtsies_repl.py
@@ -30,7 +30,7 @@ def setup_config(conf):
     config.loadini(config_struct, TEST_CONFIG)
     for key, value in conf.items():
         if not hasattr(config_struct, key):
-            raise ValueError("%r is not a valid config attribute" % (key,))
+            raise ValueError(f"{key!r} is not a valid config attribute")
         setattr(config_struct, key, value)
     return config_struct
 
diff --git a/bpython/test/test_preprocess.py b/bpython/test/test_preprocess.py
diff --git a/bpython/urwid.py b/bpython/urwid.py
diff --git a/setup.py b/setup.py
