Use more f-strings

sebastinas · sebastinas · commit 2f7899bb9bf2 · 2021-11-07T22:07:50.000+01:00
diff --git a/bpython/curtsiesfrontend/interpreter.py b/bpython/curtsiesfrontend/interpreter.py
@@ -55,7 +55,7 @@ def format(self, tokensource, outfile):
         for token, text in tokensource:
             while token not in self.f_strings:
                 token = token.parent
-            o += "{}\x03{}\x04".format(self.f_strings[token], text)
+            o += f"{self.f_strings[token]}\x03{text}\x04"
         outfile.write(parse(o.rstrip()))
 
 
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -2067,7 +2067,7 @@ def key_help_text(self):
 
         max_func = max(len(func) for func, key in pairs)
         return "\n".join(
-            "{} : {}".format(func.rjust(max_func), key) for func, key in pairs
+            f"{func.rjust(max_func)} : {key}" for func, key in pairs
         )
 
     def get_session_formatted_for_file(self) -> str:
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{}".format(color_scheme[v])
+            self.f_strings[k] = f"\x01{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 += "{}\x03{}\x04".format(self.f_strings[token], text)
+            o += f"{self.f_strings[token]}\x03{text}\x04"
         outfile.write(o.rstrip())
 
 
diff --git a/bpython/simpleeval.py b/bpython/simpleeval.py
@@ -203,7 +203,7 @@ def safe_getitem(obj, index):
             return obj[index]
         except (KeyError, IndexError):
             raise EvaluationError(f"can't lookup key {index!r} on {obj!r}")
-    raise ValueError("unsafe to lookup on object of type {}".format(type(obj)))
+    raise ValueError(f"unsafe to lookup on object of type {type(obj)}")
 
 
 def find_attribute_with_name(node, name):

Original file line number	Diff line number	Diff line change
`@@ -2067,7 +2067,7 @@ def key_help_text(self):`
`2067`	`2067`
`2068`	`2068`	`max_func = max(len(func) for func, key in pairs)`
`2069`	`2069`	`return "\n".join(`
`2070`		`- "{} : {}".format(func.rjust(max_func), key) for func, key in pairs`
	`2070`	`+ f"{func.rjust(max_func)} : {key}" for func, key in pairs`
`2071`	`2071`	`)`
`2072`	`2072`
`2073`	`2073`	`def get_session_formatted_for_file(self) -> str:`