Refactoring. Using f-strings

Author: gil9red

CONTACT__examples/connect_to_ng_server_via_socket_.py

@@ -16,17 +16,15 @@
 PORT = int(PORT)
 
 
-post_data = """
+post_data = f"""
 <?xml version="1.0"?>
 <REQUEST OBJECT_CLASS="TAbonentObject" ACTION="GET_CHANGES" VERSION="0" TYPE_VERSION="I" PACK="ZLIB"
 INT_SOFT_ID="{INT_SOFT_ID}"
 POINT_CODE="{POINT_CODE}"
 SignOut="No"
 ExpectSigned="No"
 />
-""".format(
-    INT_SOFT_ID=INT_SOFT_ID, POINT_CODE=POINT_CODE
-)
+"""
 
 
 http_request = (
@@ -56,7 +54,7 @@
 sock.connect((HOST, PORT))
 sock.send(http_request.encode())
 
-print("Socket name: {}".format(sock.getsockname()))
+print(f"Socket name: {sock.getsockname()}")
 print("\nResponse:")
 
 while True:

CONTACT__examples/create_and_fill_database_from_dictionary.py

@@ -68,7 +68,7 @@ def build_field_table(format_field: dict, indent=" " * 4) -> str:
             if field_name.upper() == "ID":
                 field_type += " PRIMARY KEY"
 
-        return indent + "{} {}".format(field_name, field_type)
+        return f"{indent}{field_name} {field_type}"
 
     fields_list = [
         build_field_table(format_field) for format_field in format_fields_of_table
@@ -140,7 +140,7 @@ def create_table(
     for file_name in glob.glob("contact_dicts/*.xml"):
         table_name = os.path.splitext(os.path.basename(file_name))[0]
 
-        print("Append {} from {}".format(table_name, file_name))
+        print(f"Append {table_name} from {file_name}")
 
         root = BeautifulSoup(open(file_name, "rb"), "lxml")
 
@@ -153,7 +153,7 @@ def create_table(
         sql_table_data_rows = build_sql_rows_data_table(table_name, rows_of_dict)
         # print(sql_table + "\n\n" + sql_table_data_rows)
 
-        print("  Append {} rows\n".format(len(rows_of_dict)))
+        print(f"  Append {len(rows_of_dict)} rows\n")
         create_table(table_name, sql_table, sql_table_data_rows)
 
         # print()

CONTACT__examples/create_full_dict__GET_CHANGES_from_exported_dicts.py

@@ -46,10 +46,10 @@ def bytes_to_compress_to_base64(bytes_text: bytes) -> str:
         bytes_xml = open(file_name, "rb").read()
         base64_str = bytes_to_compress_to_base64(bytes_xml)
 
-        child_list.append("<{0}>{1}</{0}>".format(dict_name, base64_str))
+        child_list.append(f"<{dict_name}>{base64_str}</{dict_name}>")
 
     with open(FILE_NAME_FULL_DICT, "w", encoding="utf-8") as f:
         f.write(HTML_PATTERN_RESPONSE__GET_CHANGES.format("".join(child_list)))
 
     print()
-    print("Write to {}".format(FILE_NAME_FULL_DICT))
+    print(f"Write to {FILE_NAME_FULL_DICT}")

CONTACT__examples/export_dicts_from__full_dict__GET_CHANGES.py

@@ -44,7 +44,7 @@ def get_bytes_from_base64_zlib(text_or_tag_or_bytes: Union[str, bytes, Tag]) ->
 
     # Если ошибка
     if response["re"] != "0":
-        print('Error text: "{}"'.format(response["err_text"]))
+        print(f'Error text: "{response["err_text"]}"')
         sys.exit()
 
     print("Справочник полный?:", response["full"] == "1")

CONTACT__examples/get_full_dictionary__method_GET_CHANGES.py

@@ -19,17 +19,15 @@
 
 
 if __name__ == "__main__":
-    post_data = """
+    post_data = f"""
     <?xml version="1.0"?>
     <REQUEST OBJECT_CLASS="TAbonentObject" ACTION="GET_CHANGES" VERSION="0" TYPE_VERSION="I" PACK="ZLIB"
     INT_SOFT_ID="{INT_SOFT_ID}"
     POINT_CODE="{POINT_CODE}"
     SignOut="No"
     ExpectSigned="No"
     />
-    """.format(
-        INT_SOFT_ID=INT_SOFT_ID, POINT_CODE=POINT_CODE
-    )
+    """
 
     rs = requests.post(URL_NG_SERVER, data=post_data)
     print(rs)
@@ -38,4 +36,4 @@
     with open(FILE_NAME_FULL_DICT, "wb") as f:
         f.write(rs.content)
 
-    print("Write to: {}".format(FILE_NAME_FULL_DICT))
+    print(f"Write to: {FILE_NAME_FULL_DICT}")

CONTACT__examples/reducing number row in rows dicts.py

@@ -32,11 +32,11 @@
         row.decompose()
 
     rows = root.select("row")
-    print("  len {} -> {}".format(old_len, len(rows)))
+    print(f"  len {old_len} -> {len(rows)}")
 
     file_name = "mini_contact_dicts/" + os.path.basename(file_name)
     with open(file_name, "w", encoding="cp1251") as f:
         f.write(str(root))
 
-    print("  Write to {}".format(file_name))
+    print(f"  Write to {file_name}")
     print()

Crypto Git Repository/config.py

@@ -18,7 +18,7 @@
 
 # How use without input login and password:
 # git clone https://username:[email protected]/username/repository.git
-URL_GIT = "https://{0}:{1}@github.com/{0}/{2}.git".format(LOGIN, PASSWORD, NEW_REPO)
+URL_GIT = f"https://{LOGIN}:{PASSWORD}@github.com/{LOGIN}/{NEW_REPO}.git"
 
 
 if PROXY:

concurrency_in_python__threading_processing/multithreading__threading__examples/example multiprocessing.dummy/urls.py

@@ -32,7 +32,7 @@
 for url in urls:
     result = urlopen(url)
     results.append(result)
-print("Single thread: {:.3f} seconds".format(time.clock() - t))
+print(f"Single thread: {time.clock() - t:.3f} seconds")
 
 # ------- VERSUS ------- #
 
@@ -43,7 +43,7 @@ def go(count=1):
     results = pool.map(urlopen, urls)
     # pool.close()
     # pool.join()
-    print("{} Pool: {:.3f} seconds".format(count, time.clock() - t))
+    print(f"{count} Pool: {time.clock() - t:.3f} seconds")
 
 
 # ------- 1 Pool ------- #

concurrency_in_python__threading_processing/multithreading__threading__examples/flask__threaded/threaded__with.py

@@ -13,7 +13,7 @@
 
 @app.route("/")
 def index():
-    return "Current thread: {}".format(threading.current_thread())
+    return f"Current thread: {threading.current_thread()}"
 
 
 if __name__ == "__main__":

concurrency_in_python__threading_processing/multithreading__threading__examples/sync_vs_async__with_requests_and_bs4.py

@@ -28,7 +28,7 @@ def go(url):
 t = time.time()
 result = [go(url) for url in urls]
 print(result)
-print("Elapsed {:.3f} secs".format(time.time() - t))
+print(f"Elapsed {time.time() - t:.3f} secs")
 # ['Streletz', 'Kromster', 'Stepan Kasyanenko', 'Kromster', 'JamesJGoodwin']
 # Elapsed 6.030 secs
 
@@ -38,6 +38,6 @@ def go(url):
 pool = ThreadPool()
 result = pool.map(go, urls)
 print(result)
-print("Elapsed {:.3f} secs".format(time.time() - t))
+print(f"Elapsed {time.time() - t:.3f} secs")
 # ['Streletz', 'Kromster', 'Stepan Kasyanenko', 'Kromster', 'JamesJGoodwin']
 # Elapsed 3.203 secs

concurrency_in_python__threading_processing/multithreading__threading__examples/threading_with_webservers__flask.py

@@ -16,7 +16,7 @@ def run(port: int = 80):
 
     @app.route("/")
     def index():
-        html = "Hello World! (port={})".format(port)
+        html = f"Hello World! (port={port})"
         print(html)
 
         return html

concurrency_in_python__threading_processing/multithreading__threading__examples/timeout_run_function.py

@@ -16,7 +16,7 @@ def post_msg(self):
         time.sleep(3)
 
         # Написать пользователю
-        print("Hi, {}! current_thread: {}".format(self.name, current_thread()))
+        print(f"Hi, {self.name}! current_thread: {current_thread()}")
 
 
 user_1 = User("Vasya")
@@ -30,7 +30,7 @@ def foo(name):
     time.sleep(5)
 
     # Написать пользователю
-    print("Hi, {}! current_thread: {}".format(name, current_thread()))
+    print(f"Hi, {name}! current_thread: {current_thread()}")
 
 
 Thread(target=lambda: foo("Thread")).start()

converter mils - mm/main.py

@@ -18,5 +18,5 @@ def mm2mils(mm: float) -> float:
 if __name__ == "__main__":
     mm = 50.0
     mils = 1968.0
-    print("{} mm -> {} mils".format(mm, mm2mils(mm)))
-    print("{} mils -> {} mm".format(mils, mils2mm(mils)))
+    print(f"{mm} mm -> {mm2mils(mm)} mils")
+    print(f"{mils} mils -> {mils2mm(mils)} mm")