Apply a couple refurb suggestions (#9944)

* Apply refurb suggestion [FURB138]: Consider using list comprehension * Apply refurb suggestion [FURB108]: Replace `x == y or x == z` with `x in (y, z)`
pyca · Nov 30, 2023 · 3fa1405 · 3fa1405
1 parent d146423
commit 3fa1405
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py
@@ -174,7 +174,7 @@ def openssl_version_number(self) -> int:
         return self._lib.OpenSSL_version_num()
 
     def _evp_md_from_algorithm(self, algorithm: hashes.HashAlgorithm):
-        if algorithm.name == "blake2b" or algorithm.name == "blake2s":
+        if algorithm.name in ("blake2b", "blake2s"):
             alg = f"{algorithm.name}{algorithm.digest_size * 8}".encode(
                 "ascii"
             )

diff --git a/src/cryptography/x509/name.py b/src/cryptography/x509/name.py
@@ -132,10 +132,7 @@ def __init__(
             if not isinstance(value, str):
                 raise TypeError("value argument must be a str")
 
-        if (
-            oid == NameOID.COUNTRY_NAME
-            or oid == NameOID.JURISDICTION_COUNTRY_NAME
-        ):
+        if oid in (NameOID.COUNTRY_NAME, NameOID.JURISDICTION_COUNTRY_NAME):
             assert isinstance(value, str)
             c_len = len(value.encode("utf8"))
             if c_len != 2 and _validate is True:

diff --git a/tests/hazmat/primitives/test_aead.py b/tests/hazmat/primitives/test_aead.py
@@ -732,10 +732,11 @@ def test_vectors(self, backend, subtests):
                 aad1 = vector.get("aad", None)
                 aad2 = vector.get("aad2", None)
                 aad3 = vector.get("aad3", None)
-                aad = []
-                for a in [aad1, aad2, aad3]:
-                    if a is not None:
-                        aad.append(binascii.unhexlify(a))
+                aad = [
+                    binascii.unhexlify(a)
+                    for a in (aad1, aad2, aad3)
+                    if a is not None
+                ]
                 ct = binascii.unhexlify(vector["ciphertext"])
                 tag = binascii.unhexlify(vector["tag"])
                 pt = binascii.unhexlify(vector.get("plaintext", b""))
@@ -757,10 +758,11 @@ def test_vectors_invalid(self, backend, subtests):
                 aad1 = vector.get("aad", None)
                 aad2 = vector.get("aad2", None)
                 aad3 = vector.get("aad3", None)
-                aad = []
-                for a in [aad1, aad2, aad3]:
-                    if a is not None:
-                        aad.append(binascii.unhexlify(a))
+                aad = [
+                    binascii.unhexlify(a)
+                    for a in (aad1, aad2, aad3)
+                    if a is not None
+                ]
 
                 ct = binascii.unhexlify(vector["ciphertext"])
                 aessiv = AESSIV(key)