Black everything

Author: alex

.github/workflows/ci.yml

@@ -16,7 +16,6 @@ jobs:
       matrix:
         PYTHON:
           - {VERSION: "3.9", TOXENV: "pep8,packaging,docs", COVERAGE: "false"}
-          - {VERSION: "pypy2", TOXENV: "pypy-nocoverage", COVERAGE: "false"}
           - {VERSION: "pypy3", TOXENV: "pypy3-nocoverage", COVERAGE: "false"}
           - {VERSION: "3.9", TOXENV: "py39", OPENSSL: {TYPE: "openssl", VERSION: "1.1.0l"}}
           - {VERSION: "3.9", TOXENV: "py39", OPENSSL: {TYPE: "openssl", VERSION: "1.1.1h"}}

docs/conf.py

@@ -81,7 +81,7 @@
 base_dir = os.path.join(os.path.dirname(__file__), os.pardir)
 about = {}
 with open(os.path.join(base_dir, "src", "cryptography", "__about__.py")) as f:
-    exec (f.read(), about)
+    exec(f.read(), about)
 
 version = release = about["__version__"]
 

setup.py

@@ -77,7 +77,7 @@
             where="src", exclude=["_cffi_src", "_cffi_src.*"]
         ),
         include_package_data=True,
-        python_requires=(">=3.6"),
+        python_requires=">=3.6",
         install_requires=setup_requirements,
         setup_requires=setup_requirements,
         extras_require={

src/_cffi_src/utils.py

@@ -16,7 +16,7 @@
 base_src = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 about = {}
 with open(os.path.join(base_src, "cryptography", "__about__.py")) as f:
-    exec (f.read(), about)
+    exec(f.read(), about)
 
 
 def build_ffi_for_binding(

src/cryptography/hazmat/backends/openssl/backend.py

@@ -1165,7 +1165,7 @@ def _create_x509_extension(self, handlers, extension):
                 *[
                     encode_der(INTEGER, encode_der_integer(x.value))
                     for x in extension.value
-                ]
+                ],
             )
             value = _encode_asn1_str_gc(self, asn1)
             return self._create_raw_x509_extension(extension, value)

src/cryptography/hazmat/backends/openssl/decode_asn1.py

@@ -130,7 +130,7 @@ def _decode_general_name(backend, gn):
             if "1" in bits[prefix:]:
                 raise ValueError("Invalid netmask")
 
-            ip = ipaddress.ip_network(base.exploded + u"/{}".format(prefix))
+            ip = ipaddress.ip_network(base.exploded + "/{}".format(prefix))
         else:
             ip = ipaddress.ip_address(data)
 

src/cryptography/hazmat/primitives/asymmetric/dh.py

@@ -86,9 +86,7 @@ def public_key(self, backend=None):
 
 class DHParameterNumbers(object):
     def __init__(self, p, g, q=None):
-        if not isinstance(p, int) or not isinstance(
-            g, int
-        ):
+        if not isinstance(p, int) or not isinstance(g, int):
             raise TypeError("p and g must be integers")
         if q is not None and not isinstance(q, int):
             raise TypeError("q must be integer or None")

src/cryptography/hazmat/primitives/asymmetric/ec.py

@@ -95,7 +95,9 @@ def sign(self, data, signature_algorithm):
         """
 
 
-class EllipticCurvePrivateKeyWithSerialization(EllipticCurvePrivateKey, metaclass=abc.ABCMeta):
+class EllipticCurvePrivateKeyWithSerialization(
+    EllipticCurvePrivateKey, metaclass=abc.ABCMeta
+):
     @abc.abstractmethod
     def private_numbers(self):
         """
@@ -335,9 +337,7 @@ def derive_private_key(private_value, curve, backend=None):
 
 class EllipticCurvePublicNumbers(object):
     def __init__(self, x, y, curve):
-        if not isinstance(x, int) or not isinstance(
-            y, int
-        ):
+        if not isinstance(x, int) or not isinstance(y, int):
             raise TypeError("x and y must be integers.")
 
         if not isinstance(curve, EllipticCurve):

src/cryptography/hazmat/primitives/asymmetric/rsa.py

@@ -5,12 +5,7 @@
 from __future__ import absolute_import, division, print_function
 
 import abc
-
-try:
-    # Only available in math in 3.5+
-    from math import gcd
-except ImportError:
-    from fractions import gcd
+from math import gcd
 
 from cryptography import utils
 from cryptography.exceptions import UnsupportedAlgorithm, _Reasons
@@ -338,9 +333,7 @@ def __hash__(self):
 
 class RSAPublicNumbers(object):
     def __init__(self, e, n):
-        if not isinstance(e, int) or not isinstance(
-            n, int
-        ):
+        if not isinstance(e, int) or not isinstance(n, int):
             raise TypeError("RSAPublicNumbers arguments must be integers.")
 
         self._e = e

src/cryptography/hazmat/primitives/serialization/ssh.py

@@ -8,6 +8,7 @@
 import os
 import re
 import struct
+from base64 import encodebytes as _base64_encode
 
 from cryptography import utils
 from cryptography.exceptions import UnsupportedAlgorithm
@@ -32,11 +33,6 @@ def _bcrypt_kdf(*args, **kwargs):
         raise UnsupportedAlgorithm("Need bcrypt module")
 
 
-try:
-    from base64 import encodebytes as _base64_encode
-except ImportError:
-    from base64 import encodestring as _base64_encode
-
 _SSH_ED25519 = b"ssh-ed25519"
 _SSH_RSA = b"ssh-rsa"
 _SSH_DSA = b"ssh-dss"

src/cryptography/utils.py

@@ -5,7 +5,6 @@
 from __future__ import absolute_import, division, print_function
 
 import abc
-import binascii
 import inspect
 import sys
 import warnings
@@ -72,12 +71,6 @@ class InterfaceNotImplemented(Exception):
     pass
 
 
-if hasattr(inspect, "signature"):
-    signature = inspect.signature
-else:
-    signature = inspect.getargspec
-
-
 def verify_interface(iface, klass):
     for method in iface.__abstractmethods__:
         if not hasattr(klass, method):
@@ -87,8 +80,8 @@ def verify_interface(iface, klass):
         if isinstance(getattr(iface, method), abc.abstractproperty):
             # Can't properly verify these yet.
             continue
-        sig = signature(getattr(iface, method))
-        actual = signature(getattr(klass, method))
+        sig = inspect.signature(getattr(iface, method))
+        actual = inspect.signature(getattr(klass, method))
         if sig != actual:
             raise InterfaceNotImplemented(
                 "{}.{}'s signature differs from the expected. Expected: "

src/cryptography/x509/extensions.py

@@ -668,9 +668,9 @@ def __init__(self, require_explicit_policy, inhibit_policy_mapping):
 
     def __repr__(self):
         return (
-            u"<PolicyConstraints(require_explicit_policy={0.require_explicit"
-            u"_policy}, inhibit_policy_mapping={0.inhibit_policy_"
-            u"mapping})>".format(self)
+            "<PolicyConstraints(require_explicit_policy={0.require_explicit"
+            "_policy}, inhibit_policy_mapping={0.inhibit_policy_"
+            "mapping})>".format(self)
         )
 
     def __eq__(self, other):
@@ -740,8 +740,7 @@ def __init__(self, policy_identifier, policy_qualifiers):
         if policy_qualifiers:
             policy_qualifiers = list(policy_qualifiers)
             if not all(
-                isinstance(x, (str, UserNotice))
-                for x in policy_qualifiers
+                isinstance(x, (str, UserNotice)) for x in policy_qualifiers
             ):
                 raise TypeError(
                     "policy_qualifiers must be a list of strings and/or "
@@ -1177,8 +1176,8 @@ def _validate_ip_name(self, tree):
 
     def __repr__(self):
         return (
-            u"<NameConstraints(permitted_subtrees={0.permitted_subtrees}, "
-            u"excluded_subtrees={0.excluded_subtrees})>".format(self)
+            "<NameConstraints(permitted_subtrees={0.permitted_subtrees}, "
+            "excluded_subtrees={0.excluded_subtrees})>".format(self)
         )
 
     def __hash__(self):

tests/hazmat/backends/test_openssl.py

@@ -39,17 +39,17 @@
 
 
 def skip_if_libre_ssl(openssl_version):
-    if u"LibreSSL" in openssl_version:
+    if "LibreSSL" in openssl_version:
         pytest.skip("LibreSSL hard-codes RAND_bytes to use arc4random.")
 
 
 class TestLibreSkip(object):
     def test_skip_no(self):
-        assert skip_if_libre_ssl(u"OpenSSL 1.0.2h  3 May 2016") is None
+        assert skip_if_libre_ssl("OpenSSL 1.0.2h  3 May 2016") is None
 
     def test_skip_yes(self):
         with pytest.raises(pytest.skip.Exception):
-            skip_if_libre_ssl(u"LibreSSL 2.1.6")
+            skip_if_libre_ssl("LibreSSL 2.1.6")
 
 
 class DummyMGF(object):

tests/hazmat/primitives/test_chacha20.py

@@ -71,4 +71,4 @@ def test_invalid_nonce(self):
 
     def test_invalid_key_type(self):
         with pytest.raises(TypeError, match="key must be bytes"):
-            algorithms.ChaCha20(u"0" * 32, b"0" * 16)
+            algorithms.ChaCha20("0" * 32, b"0" * 16)

tests/hazmat/primitives/test_ciphers.py

@@ -46,7 +46,7 @@ def test_invalid_key_size(self):
 
     def test_invalid_key_type(self):
         with pytest.raises(TypeError, match="key must be bytes"):
-            AES(u"0" * 32)
+            AES("0" * 32)
 
 
 class TestAESXTS(object):
@@ -94,7 +94,7 @@ def test_invalid_key_size(self):
 
     def test_invalid_key_type(self):
         with pytest.raises(TypeError, match="key must be bytes"):
-            Camellia(u"0" * 32)
+            Camellia("0" * 32)
 
 
 class TestTripleDES(object):
@@ -109,7 +109,7 @@ def test_invalid_key_size(self):
 
     def test_invalid_key_type(self):
         with pytest.raises(TypeError, match="key must be bytes"):
-            TripleDES(u"0" * 16)
+            TripleDES("0" * 16)
 
 
 class TestBlowfish(object):
@@ -127,7 +127,7 @@ def test_invalid_key_size(self):
 
     def test_invalid_key_type(self):
         with pytest.raises(TypeError, match="key must be bytes"):
-            Blowfish(u"0" * 8)
+            Blowfish("0" * 8)
 
 
 class TestCAST5(object):
@@ -145,7 +145,7 @@ def test_invalid_key_size(self):
 
     def test_invalid_key_type(self):
         with pytest.raises(TypeError, match="key must be bytes"):
-            CAST5(u"0" * 10)
+            CAST5("0" * 10)
 
 
 class TestARC4(object):
@@ -171,7 +171,7 @@ def test_invalid_key_size(self):
 
     def test_invalid_key_type(self):
         with pytest.raises(TypeError, match="key must be bytes"):
-            ARC4(u"0" * 10)
+            ARC4("0" * 10)
 
 
 class TestIDEA(object):
@@ -185,7 +185,7 @@ def test_invalid_key_size(self):
 
     def test_invalid_key_type(self):
         with pytest.raises(TypeError, match="key must be bytes"):
-            IDEA(u"0" * 16)
+            IDEA("0" * 16)
 
 
 class TestSEED(object):
@@ -199,7 +199,7 @@ def test_invalid_key_size(self):
 
     def test_invalid_key_type(self):
         with pytest.raises(TypeError, match="key must be bytes"):
-            SEED(u"0" * 16)
+            SEED("0" * 16)
 
 
 def test_invalid_backend():

tests/hazmat/primitives/test_cmac.py

@@ -182,10 +182,10 @@ def test_verify_reject_unicode(self, backend):
         cmac = CMAC(AES(key), backend)
 
         with pytest.raises(TypeError):
-            cmac.update(u"")
+            cmac.update("")
 
         with pytest.raises(TypeError):
-            cmac.verify(u"")
+            cmac.verify("")
 
     @pytest.mark.supported(
         only_if=lambda backend: backend.cmac_algorithm_supported(

tests/hazmat/primitives/test_concatkdf.py

@@ -100,29 +100,29 @@ def test_invalid_verify(self, backend):
     def test_unicode_typeerror(self, backend):
         with pytest.raises(TypeError):
             ConcatKDFHash(
-                hashes.SHA256(), 16, otherinfo=u"foo", backend=backend
+                hashes.SHA256(), 16, otherinfo="foo", backend=backend
             )
 
         with pytest.raises(TypeError):
             ckdf = ConcatKDFHash(
                 hashes.SHA256(), 16, otherinfo=None, backend=backend
             )
 
-            ckdf.derive(u"foo")
+            ckdf.derive("foo")
 
         with pytest.raises(TypeError):
             ckdf = ConcatKDFHash(
                 hashes.SHA256(), 16, otherinfo=None, backend=backend
             )
 
-            ckdf.verify(u"foo", b"bar")
+            ckdf.verify("foo", b"bar")
 
         with pytest.raises(TypeError):
             ckdf = ConcatKDFHash(
                 hashes.SHA256(), 16, otherinfo=None, backend=backend
             )
 
-            ckdf.verify(b"foo", u"bar")
+            ckdf.verify(b"foo", "bar")
 
 
 @pytest.mark.requires_backend_interface(interface=HMACBackend)
@@ -249,7 +249,7 @@ def test_unicode_typeerror(self, backend):
             ConcatKDFHMAC(
                 hashes.SHA256(),
                 16,
-                salt=u"foo",
+                salt="foo",
                 otherinfo=None,
                 backend=backend,
             )
@@ -259,7 +259,7 @@ def test_unicode_typeerror(self, backend):
                 hashes.SHA256(),
                 16,
                 salt=None,
-                otherinfo=u"foo",
+                otherinfo="foo",
                 backend=backend,
             )
 
@@ -268,21 +268,21 @@ def test_unicode_typeerror(self, backend):
                 hashes.SHA256(), 16, salt=None, otherinfo=None, backend=backend
             )
 
-            ckdf.derive(u"foo")
+            ckdf.derive("foo")
 
         with pytest.raises(TypeError):
             ckdf = ConcatKDFHMAC(
                 hashes.SHA256(), 16, salt=None, otherinfo=None, backend=backend
             )
 
-            ckdf.verify(u"foo", b"bar")
+            ckdf.verify("foo", b"bar")
 
         with pytest.raises(TypeError):
             ckdf = ConcatKDFHMAC(
                 hashes.SHA256(), 16, salt=None, otherinfo=None, backend=backend
             )
 
-            ckdf.verify(b"foo", u"bar")
+            ckdf.verify(b"foo", "bar")
 
 
 def test_invalid_backend():