MAINT: Updated f-string method (TheAlgorithms#6230)

* MAINT: Used f-string method

Updated the code with f-string methods wherever required for a better and cleaner understanding of the code.

* Updated files with f-string method

* Update rsa_key_generator.py

* Update rsa_key_generator.py

* Update elgamal_key_generator.py

* Update lru_cache.py

I don't think this change is efficient but it might tackle the error as the error was due to using long character lines.

* Update lru_cache.py

* Update lru_cache.py

Co-authored-by: cyai <seriesscar@gmail.com>
Co-authored-by: Christian Clauss <cclauss@me.com>

Author: 3 people

ciphers/elgamal_key_generator.py

@@ -38,9 +38,7 @@ def generate_key(key_size: int) -> tuple[tuple[int, int, int, int], tuple[int, i
 
 
 def make_key_files(name: str, keySize: int) -> None:
-    if os.path.exists("%s_pubkey.txt" % name) or os.path.exists(
-        "%s_privkey.txt" % name
-    ):
+    if os.path.exists(f"{name}_pubkey.txt") or os.path.exists(f"{name}_privkey.txt"):
         print("\nWARNING:")
         print(
             '"%s_pubkey.txt" or "%s_privkey.txt" already exists. \n'
@@ -50,14 +48,14 @@ def make_key_files(name: str, keySize: int) -> None:
         sys.exit()
 
     publicKey, privateKey = generate_key(keySize)
-    print("\nWriting public key to file %s_pubkey.txt..." % name)
-    with open("%s_pubkey.txt" % name, "w") as fo:
+    print(f"\nWriting public key to file {name}_pubkey.txt...")
+    with open(f"{name}_pubkey.txt", "w") as fo:
         fo.write(
             "%d,%d,%d,%d" % (publicKey[0], publicKey[1], publicKey[2], publicKey[3])
         )
 
-    print("Writing private key to file %s_privkey.txt..." % name)
-    with open("%s_privkey.txt" % name, "w") as fo:
+    print(f"Writing private key to file {name}_privkey.txt...")
+    with open(f"{name}_privkey.txt", "w") as fo:
         fo.write("%d,%d" % (privateKey[0], privateKey[1]))
 
 

ciphers/rsa_cipher.py

@@ -129,15 +129,15 @@ def main() -> None:
 
         message = input("\nEnter message: ")
         pubkey_filename = "rsa_pubkey.txt"
-        print("Encrypting and writing to %s..." % (filename))
+        print(f"Encrypting and writing to {filename}...")
         encryptedText = encrypt_and_write_to_file(filename, pubkey_filename, message)
 
         print("\nEncrypted text:")
         print(encryptedText)
 
     elif mode == "decrypt":
         privkey_filename = "rsa_privkey.txt"
-        print("Reading from %s and decrypting..." % (filename))
+        print(f"Reading from {filename} and decrypting...")
         decrypted_text = read_from_file_and_decrypt(filename, privkey_filename)
         print("writing decryption to rsa_decryption.txt...")
         with open("rsa_decryption.txt", "w") as dec:

ciphers/rsa_key_generator.py

@@ -34,9 +34,7 @@ def generateKey(keySize: int) -> tuple[tuple[int, int], tuple[int, int]]:
 
 
 def makeKeyFiles(name: str, keySize: int) -> None:
-    if os.path.exists("%s_pubkey.txt" % (name)) or os.path.exists(
-        "%s_privkey.txt" % (name)
-    ):
+    if os.path.exists(f"{name}_pubkey.txt") or os.path.exists(f"{name}_privkey.txt"):
         print("\nWARNING:")
         print(
             '"%s_pubkey.txt" or "%s_privkey.txt" already exists. \n'
@@ -46,12 +44,12 @@ def makeKeyFiles(name: str, keySize: int) -> None:
         sys.exit()
 
     publicKey, privateKey = generateKey(keySize)
-    print("\nWriting public key to file %s_pubkey.txt..." % name)
-    with open("%s_pubkey.txt" % name, "w") as out_file:
+    print(f"\nWriting public key to file {name}_pubkey.txt...")
+    with open(f"{name}_pubkey.txt", "w") as out_file:
         out_file.write(f"{keySize},{publicKey[0]},{publicKey[1]}")
 
-    print("Writing private key to file %s_privkey.txt..." % name)
-    with open("%s_privkey.txt" % name, "w") as out_file:
+    print(f"Writing private key to file {name}_privkey.txt...")
+    with open(f"{name}_privkey.txt", "w") as out_file:
         out_file.write(f"{keySize},{privateKey[0]},{privateKey[1]}")
 
 

ciphers/transposition_cipher.py

@@ -10,7 +10,7 @@
 
 def main() -> None:
     message = input("Enter message: ")
-    key = int(input("Enter key [2-%s]: " % (len(message) - 1)))
+    key = int(input(f"Enter key [2-{len(message) - 1}]: "))
     mode = input("Encryption/Decryption [e/d]: ")
 
     if mode.lower().startswith("e"):
@@ -19,7 +19,7 @@ def main() -> None:
         text = decryptMessage(key, message)
 
     # Append pipe symbol (vertical bar) to identify spaces at the end.
-    print("Output:\n%s" % (text + "|"))
+    print(f"Output:\n{text + '|'}")
 
 
 def encryptMessage(key: int, message: str) -> str:

ciphers/transposition_cipher_encrypt_decrypt_file.py

@@ -12,10 +12,10 @@ def main() -> None:
     mode = input("Encrypt/Decrypt [e/d]: ")
 
     if not os.path.exists(inputFile):
-        print("File %s does not exist. Quitting..." % inputFile)
+        print(f"File {inputFile} does not exist. Quitting...")
         sys.exit()
     if os.path.exists(outputFile):
-        print("Overwrite %s? [y/n]" % outputFile)
+        print(f"Overwrite {outputFile}? [y/n]")
         response = input("> ")
         if not response.lower().startswith("y"):
             sys.exit()

ciphers/vigenere_cipher.py

@@ -13,7 +13,7 @@ def main() -> None:
         mode = "decrypt"
         translated = decryptMessage(key, message)
 
-    print("\n%sed message:" % mode.title())
+    print(f"\n{mode.title()}ed message:")
     print(translated)
 
 

data_structures/binary_tree/binary_search_tree.py

@@ -15,7 +15,7 @@ def __repr__(self):
 
         if self.left is None and self.right is None:
             return str(self.value)
-        return pformat({"%s" % (self.value): (self.left, self.right)}, indent=1)
+        return pformat({f"{self.value}": (self.left, self.right)}, indent=1)
 
 
 class BinarySearchTree:

hashes/chaos_machine.py

@@ -96,7 +96,7 @@ def reset():
 
     # Pulling Data (Output)
     while inp in ("e", "E"):
-        print("%s" % format(pull(), "#04x"))
+        print(f"{format(pull(), '#04x')}")
         print(buffer_space)
         print(params_space)
         inp = input("(e)exit? ").strip()

machine_learning/gradient_boosting_regressor.py

@@ -47,9 +47,9 @@ def main():
     y_pred = model.predict(X_test)
 
     # The mean squared error
-    print("Mean squared error: %.2f" % mean_squared_error(y_test, y_pred))
+    print(f"Mean squared error: {mean_squared_error(y_test, y_pred):.2f}")
     # Explained variance score: 1 is perfect prediction
-    print("Test Variance score: %.2f" % r2_score(y_test, y_pred))
+    print(f"Test Variance score: {r2_score(y_test, y_pred):.2f}")
 
     # So let's run the model against the test data
     fig, ax = plt.subplots()

machine_learning/k_means_clust.py

@@ -164,9 +164,7 @@ def kmeans(
             num_changed = np.sum(prev_cluster_assignment != cluster_assignment)
             if verbose:
                 print(
-                    "    {:5d} elements changed their cluster assignment.".format(
-                        num_changed
-                    )
+                    f"    {num_changed:5d} elements changed their cluster assignment."
                 )
 
         # Record heterogeneity convergence metric