Blacken Paramiko on 2.4

1 files changed, 38 insertions, 23 deletions

diff --git a/paramiko/ecdsakey.py b/paramiko/ecdsakey.py
index 92e01a75..4b7984ca 100644
--- a/paramiko/ecdsakey.py
+++ b/paramiko/ecdsakey.py
@@ -25,7 +25,8 @@ from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import hashes, serialization
 from cryptography.hazmat.primitives.asymmetric import ec
 from cryptography.hazmat.primitives.asymmetric.utils import (
-    decode_dss_signature, encode_dss_signature
+    decode_dss_signature,
+    encode_dss_signature,
 )
 
 from paramiko.common import four_byte
@@ -43,6 +44,7 @@ class _ECDSACurve(object):
     the proper hash function. Also grabs the proper curve from the 'ecdsa'
     package.
     """
+
     def __init__(self, curve_class, nist_name):
         self.nist_name = nist_name
         self.key_length = curve_class.key_size
@@ -67,6 +69,7 @@ class _ECDSACurveSet(object):
     format identifier. The two ways in which ECDSAKey needs to be able to look
     up curves.
     """
+
     def __init__(self, ecdsa_curves):
         self.ecdsa_curves = ecdsa_curves
 
@@ -95,14 +98,24 @@ class ECDSAKey(PKey):
     data.
     """
 
-    _ECDSA_CURVES = _ECDSACurveSet([
-        _ECDSACurve(ec.SECP256R1, 'nistp256'),
-        _ECDSACurve(ec.SECP384R1, 'nistp384'),
-        _ECDSACurve(ec.SECP521R1, 'nistp521'),
-    ])
-
-    def __init__(self, msg=None, data=None, filename=None, password=None,
-                 vals=None, file_obj=None, validate_point=True):
+    _ECDSA_CURVES = _ECDSACurveSet(
+        [
+            _ECDSACurve(ec.SECP256R1, "nistp256"),
+            _ECDSACurve(ec.SECP384R1, "nistp384"),
+            _ECDSACurve(ec.SECP521R1, "nistp521"),
+        ]
+    )
+
+    def __init__(
+        self,
+        msg=None,
+        data=None,
+        filename=None,
+        password=None,
+        vals=None,
+        file_obj=None,
+        validate_point=True,
+    ):
         self.verifying_key = None
         self.signing_key = None
         self.public_blob = None
@@ -126,7 +139,7 @@ class ECDSAKey(PKey):
             # identifier, so strip out any cert business. (NOTE: could push
             # that into _ECDSACurveSet.get_by_key_format_identifier(), but it
             # feels more correct to do it here?)
-            suffix = '-cert-v01@openssh.com'
+            suffix = "-cert-v01@openssh.com"
             if key_type.endswith(suffix):
                 key_type = key_type[:-len(suffix)]
             self.ecdsa_curve = self._ECDSA_CURVES.get_by_key_format_identifier(
@@ -134,13 +147,10 @@ class ECDSAKey(PKey):
             )
             key_types = self._ECDSA_CURVES.get_key_format_identifier_list()
             cert_types = [
-                '{}-cert-v01@openssh.com'.format(x)
-                for x in key_types
+                "{}-cert-v01@openssh.com".format(x) for x in key_types
             ]
             self._check_type_and_load_cert(
-                msg=msg,
-                key_type=key_types,
-                cert_type=cert_types,
+                msg=msg, key_type=key_types, cert_type=cert_types
             )
             curvename = msg.get_text()
             if curvename != self.ecdsa_curve.nist_name:
@@ -172,10 +182,10 @@ class ECDSAKey(PKey):
         key_size_bytes = (key.curve.key_size + 7) // 8
 
         x_bytes = deflate_long(numbers.x, add_sign_padding=False)
-        x_bytes = b'\x00' * (key_size_bytes - len(x_bytes)) + x_bytes
+        x_bytes = b"\x00" * (key_size_bytes - len(x_bytes)) + x_bytes
 
         y_bytes = deflate_long(numbers.y, add_sign_padding=False)
-        y_bytes = b'\x00' * (key_size_bytes - len(y_bytes)) + y_bytes
+        y_bytes = b"\x00" * (key_size_bytes - len(y_bytes)) + y_bytes
 
         point_str = four_byte + x_bytes + y_bytes
         m.add_string(point_str)
@@ -185,8 +195,13 @@ class ECDSAKey(PKey):
         return self.asbytes()
 
     def __hash__(self):
-        return hash((self.get_name(), self.verifying_key.public_numbers().x,
-                     self.verifying_key.public_numbers().y))
+        return hash(
+            (
+                self.get_name(),
+                self.verifying_key.public_numbers().x,
+                self.verifying_key.public_numbers().y,
+            )
+        )
 
     def get_name(self):
         return self.ecdsa_curve.key_format_identifier
@@ -228,7 +243,7 @@ class ECDSAKey(PKey):
             filename,
             self.signing_key,
             serialization.PrivateFormat.TraditionalOpenSSL,
-            password=password
+            password=password,
         )
 
     def write_private_key(self, file_obj, password=None):
@@ -236,7 +251,7 @@ class ECDSAKey(PKey):
             file_obj,
             self.signing_key,
             serialization.PrivateFormat.TraditionalOpenSSL,
-            password=password
+            password=password,
         )
 
     @classmethod
@@ -260,11 +275,11 @@ class ECDSAKey(PKey):
     # ...internals...
 
     def _from_private_key_file(self, filename, password):
-        data = self._read_private_key_file('EC', filename, password)
+        data = self._read_private_key_file("EC", filename, password)
         self._decode_key(data)
 
     def _from_private_key(self, file_obj, password):
-        data = self._read_private_key('EC', file_obj, password)
+        data = self._read_private_key("EC", file_obj, password)
         self._decode_key(data)
 
     def _decode_key(self, data):