Use the ruff 'pyupgrade' checks (#8104)

9 files changed, 38 insertions, 46 deletions

diff --git a/docs/development/custom-vectors/arc4/generate_arc4.py b/docs/development/custom-vectors/arc4/generate_arc4.py
index 504d19643..2ca919b40 100644
--- a/docs/development/custom-vectors/arc4/generate_arc4.py
+++ b/docs/development/custom-vectors/arc4/generate_arc4.py
@@ -76,13 +76,11 @@ def _build_vectors():
                 while current_offset < offset:
                     encryptor.update(plaintext)
                     current_offset += len(plaintext)
-                output.append("\nCOUNT = {}".format(count))
+                output.append(f"\nCOUNT = {count}")
                 count += 1
-                output.append("KEY = {}".format(key))
-                output.append("OFFSET = {}".format(offset))
-                output.append(
-                    "PLAINTEXT = {}".format(binascii.hexlify(plaintext))
-                )
+                output.append(f"KEY = {key}")
+                output.append(f"OFFSET = {offset}")
+                output.append(f"PLAINTEXT = {binascii.hexlify(plaintext)}")
                 output.append(
                     "CIPHERTEXT = {}".format(
                         binascii.hexlify(encryptor.update(plaintext))
diff --git a/docs/development/custom-vectors/cast5/generate_cast5.py b/docs/development/custom-vectors/cast5/generate_cast5.py
index b57d71ddb..27fb4634e 100644
--- a/docs/development/custom-vectors/cast5/generate_cast5.py
+++ b/docs/development/custom-vectors/cast5/generate_cast5.py
@@ -25,7 +25,7 @@ def build_vectors(mode, filename):
     iv = None
     plaintext = None
 
-    with open(filename, "r") as vector_file:
+    with open(filename) as vector_file:
         for line in vector_file:
             line = line.strip()
             if line.startswith("KEY"):
@@ -35,20 +35,18 @@ def build_vectors(mode, filename):
                             encrypt(mode, key, iv, plaintext)
                         )
                     )
-                output.append("\nCOUNT = {}".format(count))
+                output.append(f"\nCOUNT = {count}")
                 count += 1
                 name, key = line.split(" = ")
-                output.append("KEY = {}".format(key))
+                output.append(f"KEY = {key}")
             elif line.startswith("IV"):
                 name, iv = line.split(" = ")
                 iv = iv[0:16]
-                output.append("IV = {}".format(iv))
+                output.append(f"IV = {iv}")
             elif line.startswith("PLAINTEXT"):
                 name, plaintext = line.split(" = ")
-                output.append("PLAINTEXT = {}".format(plaintext))
-        output.append(
-            "CIPHERTEXT = {}".format(encrypt(mode, key, iv, plaintext))
-        )
+                output.append(f"PLAINTEXT = {plaintext}")
+        output.append(f"CIPHERTEXT = {encrypt(mode, key, iv, plaintext)}")
     return "\n".join(output)
 
 
diff --git a/docs/development/custom-vectors/hkdf/generate_hkdf.py b/docs/development/custom-vectors/hkdf/generate_hkdf.py
index 410d26f27..97ad2fae7 100644
--- a/docs/development/custom-vectors/hkdf/generate_hkdf.py
+++ b/docs/development/custom-vectors/hkdf/generate_hkdf.py
@@ -24,7 +24,7 @@ def _build_vectors():
         "IKM = " + binascii.hexlify(IKM).decode("ascii"),
         "salt = ",
         "info = ",
-        "L = {}".format(L),
+        f"L = {L}",
         "OKM = " + binascii.hexlify(OKM).decode("ascii"),
     ]
     return "\n".join(output)
diff --git a/docs/development/custom-vectors/idea/generate_idea.py b/docs/development/custom-vectors/idea/generate_idea.py
index 4d0defaa2..c0e93ee52 100644
--- a/docs/development/custom-vectors/idea/generate_idea.py
+++ b/docs/development/custom-vectors/idea/generate_idea.py
@@ -15,7 +15,7 @@ def encrypt(mode, key, iv, plaintext):
 
 
 def build_vectors(mode, filename):
-    with open(filename, "r") as f:
+    with open(filename) as f:
         vector_file = f.read().splitlines()
 
     count = 0
@@ -28,23 +28,21 @@ def build_vectors(mode, filename):
         if line.startswith("KEY"):
             if count != 0:
                 output.append(
-                    "CIPHERTEXT = {0}".format(
-                        encrypt(mode, key, iv, plaintext)
-                    )
+                    f"CIPHERTEXT = {encrypt(mode, key, iv, plaintext)}"
                 )
-            output.append("\nCOUNT = {0}".format(count))
+            output.append(f"\nCOUNT = {count}")
             count += 1
             name, key = line.split(" = ")
-            output.append("KEY = {0}".format(key))
+            output.append(f"KEY = {key}")
         elif line.startswith("IV"):
             name, iv = line.split(" = ")
             iv = iv[0:16]
-            output.append("IV = {0}".format(iv))
+            output.append(f"IV = {iv}")
         elif line.startswith("PLAINTEXT"):
             name, plaintext = line.split(" = ")
-            output.append("PLAINTEXT = {0}".format(plaintext))
+            output.append(f"PLAINTEXT = {plaintext}")
 
-    output.append("CIPHERTEXT = {0}".format(encrypt(mode, key, iv, plaintext)))
+    output.append(f"CIPHERTEXT = {encrypt(mode, key, iv, plaintext)}")
     return "\n".join(output)
 
 
diff --git a/docs/development/custom-vectors/idea/verify_idea.py b/docs/development/custom-vectors/idea/verify_idea.py
index d356de0ba..52e5f73f4 100644
--- a/docs/development/custom-vectors/idea/verify_idea.py
+++ b/docs/development/custom-vectors/idea/verify_idea.py
@@ -9,7 +9,7 @@ BLOCK_SIZE = 64
 
 def encrypt(mode, key, iv, plaintext):
     encryptor = botan.Cipher(
-        "IDEA/{0}/NoPadding".format(mode), "encrypt", binascii.unhexlify(key)
+        f"IDEA/{mode}/NoPadding", "encrypt", binascii.unhexlify(key)
     )
 
     cipher_text = encryptor.cipher(
@@ -19,7 +19,7 @@ def encrypt(mode, key, iv, plaintext):
 
 
 def verify_vectors(mode, filename):
-    with open(filename, "r") as f:
+    with open(filename) as f:
         vector_file = f.read().splitlines()
 
     vectors = load_nist_vectors(vector_file)
diff --git a/docs/development/custom-vectors/rsa-oaep-sha2/generate_rsa_oaep_sha2.py b/docs/development/custom-vectors/rsa-oaep-sha2/generate_rsa_oaep_sha2.py
index 6940f0400..f9e791226 100644
--- a/docs/development/custom-vectors/rsa-oaep-sha2/generate_rsa_oaep_sha2.py
+++ b/docs/development/custom-vectors/rsa-oaep-sha2/generate_rsa_oaep_sha2.py
@@ -82,7 +82,7 @@ def build_vectors(mgf1alg, hashalg, filename):
                 ),
             )
             output.append(
-                "# OAEP Example {0} alg={1} mgf1={2}".format(
+                "# OAEP Example {} alg={} mgf1={}".format(
                     count, hashalg.name, mgf1alg.name
                 )
             )
@@ -118,5 +118,5 @@ for hashtuple in itertools.product(hashalgs, hashalgs):
 
     write_file(
         build_vectors(hashtuple[0], hashtuple[1], oaep_path),
-        "oaep-{0}-{1}.txt".format(hashtuple[0].name, hashtuple[1].name),
+        f"oaep-{hashtuple[0].name}-{hashtuple[1].name}.txt",
     )
diff --git a/docs/development/custom-vectors/secp256k1/generate_secp256k1.py b/docs/development/custom-vectors/secp256k1/generate_secp256k1.py
index ab616de7f..545b25af7 100644
--- a/docs/development/custom-vectors/secp256k1/generate_secp256k1.py
+++ b/docs/development/custom-vectors/secp256k1/generate_secp256k1.py
@@ -40,7 +40,7 @@ def build_vectors(fips_vectors):
             continue
 
         yield ""
-        yield "[K-256,{0}]".format(digest_algorithm)
+        yield f"[K-256,{digest_algorithm}]"
         yield ""
 
         for message in messages:
@@ -56,12 +56,12 @@ def build_vectors(fips_vectors):
 
             r, s = sigdecode_der(signature, None)
 
-            yield "Msg = {0}".format(hexlify(message))
-            yield "d = {0:x}".format(secret_key.privkey.secret_multiplier)
-            yield "Qx = {0:x}".format(public_key.pubkey.point.x())
-            yield "Qy = {0:x}".format(public_key.pubkey.point.y())
-            yield "R = {0:x}".format(r)
-            yield "S = {0:x}".format(s)
+            yield f"Msg = {hexlify(message)}"
+            yield f"d = {secret_key.privkey.secret_multiplier:x}"
+            yield f"Qx = {public_key.pubkey.point.x():x}"
+            yield f"Qy = {public_key.pubkey.point.y():x}"
+            yield f"R = {r:x}"
+            yield f"S = {s:x}"
             yield ""
 
 
diff --git a/docs/development/custom-vectors/seed/generate_seed.py b/docs/development/custom-vectors/seed/generate_seed.py
index 3e0125b9d..c2ebf4b2b 100644
--- a/docs/development/custom-vectors/seed/generate_seed.py
+++ b/docs/development/custom-vectors/seed/generate_seed.py
@@ -15,7 +15,7 @@ def encrypt(mode, key, iv, plaintext):
 
 
 def build_vectors(mode, filename):
-    with open(filename, "r") as f:
+    with open(filename) as f:
         vector_file = f.read().splitlines()
 
     count = 0
@@ -28,22 +28,20 @@ def build_vectors(mode, filename):
         if line.startswith("KEY"):
             if count != 0:
                 output.append(
-                    "CIPHERTEXT = {0}".format(
-                        encrypt(mode, key, iv, plaintext)
-                    )
+                    f"CIPHERTEXT = {encrypt(mode, key, iv, plaintext)}"
                 )
-            output.append("\nCOUNT = {0}".format(count))
+            output.append(f"\nCOUNT = {count}")
             count += 1
             name, key = line.split(" = ")
-            output.append("KEY = {0}".format(key))
+            output.append(f"KEY = {key}")
         elif line.startswith("IV"):
             name, iv = line.split(" = ")
-            output.append("IV = {0}".format(iv))
+            output.append(f"IV = {iv}")
         elif line.startswith("PLAINTEXT"):
             name, plaintext = line.split(" = ")
-            output.append("PLAINTEXT = {0}".format(plaintext))
+            output.append(f"PLAINTEXT = {plaintext}")
 
-    output.append("CIPHERTEXT = {0}".format(encrypt(mode, key, iv, plaintext)))
+    output.append(f"CIPHERTEXT = {encrypt(mode, key, iv, plaintext)}")
     return "\n".join(output)
 
 
diff --git a/docs/development/custom-vectors/seed/verify_seed.py b/docs/development/custom-vectors/seed/verify_seed.py
index 252088d08..c28ed1e2f 100644
--- a/docs/development/custom-vectors/seed/verify_seed.py
+++ b/docs/development/custom-vectors/seed/verify_seed.py
@@ -7,7 +7,7 @@ from tests.utils import load_nist_vectors
 
 def encrypt(mode, key, iv, plaintext):
     encryptor = botan.Cipher(
-        "SEED/{0}/NoPadding".format(mode), "encrypt", binascii.unhexlify(key)
+        f"SEED/{mode}/NoPadding", "encrypt", binascii.unhexlify(key)
     )
 
     cipher_text = encryptor.cipher(
@@ -17,7 +17,7 @@ def encrypt(mode, key, iv, plaintext):
 
 
 def verify_vectors(mode, filename):
-    with open(filename, "r") as f:
+    with open(filename) as f:
         vector_file = f.read().splitlines()
 
     vectors = load_nist_vectors(vector_file)