Refactoring. Using f-strings

Author: gil9red

Damerau–Levenshtein_distance__misprints__опечатки/use__pyxdameraulevenshtein/fix_command.py

@@ -68,7 +68,7 @@ def check(text):
 
         command = fix_command(text)
         if command is None:
-            result = 'is None (не удалось распознать команду: "{}")'.format(text)
+            result = f'is None (не удалось распознать команду: "{text}")'
             print(format_text.format(text, result))
         else:
             print(format_text.format(text, command))
@@ -98,9 +98,7 @@ def check(text):
     def run_tests():
         def test(text, expected):
             command = fix_command(text)
-            assert expected == command, 'Expected: "{}", get: "{}"'.format(
-                expected, command
-            )
+            assert expected == command, f'Expected: "{expected}", get: "{command}"'
 
         expected = "команды"
         test("команды", expected)

Decorators__examples/example_1.py

@@ -8,7 +8,7 @@ def getprint(str="hello world!"):
 def decor(func):
     def wrapper(*args, **kwargs):
         print("1 begin: " + func.__name__)
-        print("Args={} kwargs={}".format(args, kwargs))
+        print(f"Args={args} kwargs={kwargs}")
         f = func(*args, **kwargs)
         print("2 end: " + func.__name__ + "\n")
         return f
@@ -31,7 +31,7 @@ def predecor(w="W"):
 def rgb2hex(get_rgb_func):
     def wrapper(*args, **kwargs):
         r, g, b = get_rgb_func(*args, **kwargs)
-        return "#{:02x}{:02x}{:02x}".format(r, g, b)
+        return f"#{r:02x}{g:02x}{b:02x}"
 
     return wrapper
 
@@ -75,15 +75,15 @@ def getrgb(self):
 
 
 rgb = RGB()
-print("rgb.r={}".format(rgb.r))
+print(f"rgb.r={rgb.r}")
 rgb.setrgb(0xFF, 0x1, 0xFF)
-print("rgb.getrgb(): %s" % rgb.getrgb())
+print(f"rgb.getrgb(): {rgb.getrgb()}")
 print()
 
 
 @decor
 def foo(a, b):
-    print("{} ^ {} = {}".format(a, b, (a**b)))
+    print(f"{a} ^ {b} = {(a ** b)}")
 
 
 foo(2, 3)

Environment variables/EnvironmentVariables.py

@@ -8,7 +8,7 @@
 
 
 # Вывести все переменные окружения (environment variables)
-print("Environment variables:\n{}".format(os.environ))
+print(f"Environment variables:\n{os.environ}")
 
 print("\nEnvironment variables:")
 for var, value in os.environ.items():

EscapePyPromptLineString/main.py

@@ -112,7 +112,7 @@ def input_text_changed(self):
             out_text = "\n".join(new_out_text)
             self.text_edit_output.setPlainText(out_text)
 
-            print("Escape for {:.3f} secs".format(time.perf_counter() - t))
+            print(f"Escape for {time.perf_counter() - t:.3f} secs")
 
         except Exception as e:
             # Выводим ошибку в консоль

EscapeString/main.py

@@ -200,7 +200,7 @@ def input_text_changed(self):
                 f"{len(self.text_edit_input.toPlainText())} -> "
                 f"{len(self.text_edit_output.toPlainText())})"
             )
-            print("Escape for {:.6f} secs".format(time.perf_counter() - t))
+            print(f"Escape for {time.perf_counter() - t:.6f} secs")
 
         except Exception as e:
             # Выводим ошибку в консоль

design_patterns__examples/Builder/example2.py

@@ -25,9 +25,7 @@ def get_value(self, key):
         return self.key_by_value[key]
 
     def __repr__(self):
-        return "Foo<items={}, values={}>".format(
-            len(self.items), len(self.key_by_value)
-        )
+        return f"Foo<items={len(self.items)}, values={len(self.key_by_value)}>"
 
 
 foo = Foo().add_item(1).add_items("abc").set_value("x", 1).set_value("x[]", [1, 2, 3])

design_patterns__examples/Builder/example_wok.py

@@ -160,7 +160,7 @@ def get_order_text(self) -> str:
         for item in self.get_order_items():
             text += f"  {item.name:25} : {item.price} рублей\n"
 
-        text += "  {:25} : {} рублей".format("", self.get_order_price())
+        text += f"  {'':25} : {self.get_order_price()} рублей"
 
         return text
 

design_patterns__examples/Observer/example_1.py

@@ -83,9 +83,8 @@ def update(self, temperature: float, humidity: float, pressure: int):
 
     def display(self):
         print(
-            "Сейчас значения: {:.1f} градусов цельсия и {:.1f}% влажности. Давление {} мм рт. ст.".format(
-                self.temperature, self.humidity, self.pressure
-            )
+            f"Сейчас значения: {self.temperature:.1f} градусов цельсия и {self.humidity:.1f}% влажности. "
+            f"Давление {self.pressure} мм рт. ст."
         )
 
 

design_patterns__examples/Proxy/example__cached.py

@@ -66,7 +66,7 @@ def __enter__(self):
             return self
 
         def __exit__(self, exc_type, exc_value, exc_traceback):
-            print("Elapsed time: {:.6f} sec".format(time.clock() - self.start_time))
+            print(f"Elapsed time: {time.clock() - self.start_time:.6f} sec")
 
     url = "https://github.com/gil9red"
 

design_patterns__examples/Proxy/example__logged.py

@@ -74,7 +74,7 @@ def __enter__(self):
             return self
 
         def __exit__(self, exc_type, exc_value, exc_traceback):
-            print("Elapsed time: {:.6f} sec".format(time.clock() - self.start_time))
+            print(f"Elapsed time: {time.clock() - self.start_time:.6f} sec")
 
     url = "https://github.com/gil9red"