formatting

Author: gstarovo

src/ecdsa/der.py

@@ -202,9 +202,11 @@ def remove_implicit(string, exp_class="context-specific"):
     s0 = str_idx_as_int(string, 0)
 
     if (s0 & tag_mask) != tag_class:
-        raise UnexpectedDER("wanted class {0}, got 0x{1:02x} tag".format(exp_class, s0))
+        raise UnexpectedDER("wanted class {0}, got 0x{1:02x} tag".\
+                            format(exp_class, s0))
     if s0 & 0b00100000 != 0:
-        raise UnexpectedDER("wanted type primitive, got 0x{0:02x} tag".format(s0))
+        raise UnexpectedDER("wanted type primitive, got 0x{0:02x} tag".\
+                            format(s0))
 
     tag = s0 & 0x1F
     length, llen = read_length(string[1:])
@@ -266,7 +268,8 @@ def remove_boolean(string):
 
 def remove_object(string):
     if not string:
-        raise UnexpectedDER("Empty string does not encode an object identifier")
+        raise UnexpectedDER(
+            "Empty string does not encode an object identifier")
     if string[:1] != b"\x06":
         n = str_idx_as_int(string, 0)
         raise UnexpectedDER("wanted type 'object' (0x06), got 0x%02x" % n)
@@ -297,10 +300,12 @@ def remove_object(string):
 
 def remove_integer(string):
     if not string:
-        raise UnexpectedDER("Empty string is an invalid encoding of an integer")
+        raise UnexpectedDER(
+            "Empty string is an invalid encoding of an integer")
     if string[:1] != b"\x02":
         n = str_idx_as_int(string, 0)
-        raise UnexpectedDER("wanted type 'integer' (0x02), got 0x%02x" % n)
+        raise UnexpectedDER(
+            "wanted type 'integer' (0x02), got 0x%02x" % n)
     length, llen = read_length(string[1:])
     if length > len(string) - 1 - llen:
         raise UnexpectedDER("Length longer than provided buffer")
@@ -491,7 +496,8 @@ def unpem(pem):
 def topem(der, name):
     b64 = base64.b64encode(compat26_str(der))
     lines = [("-----BEGIN %s-----\n" % name).encode()]
-    lines.extend([b64[start : start + 76] + b"\n" for start in range(0, len(b64), 76)])
+    lines.extend(
+        [b64[start : start + 76] + b"\n" for start in range(0, len(b64), 76)])
     lines.append(("-----END %s-----\n" % name).encode())
     return b"".join(lines)
 
@@ -532,5 +538,6 @@ def integer_to_octet_string(integer):
     length = (max(int_len, 1) + 7) // 8
     # int.to_bytes was added at python 3.2
     if version[0] < 3 or (version[0] == 3 and version[1] < 2):
-        return bytes((integer >> i * 8) & 0xFF for i in reversed(range(length)))
+        return bytes(
+            (integer >> i * 8) & 0xFF for i in reversed(range(length)))
     return int.to_bytes(integer, length=length, byteorder="big")

src/ecdsa/ecdsa.py

@@ -196,7 +196,7 @@ def verifies(self, hash, signature, accelerate=False):
             return False
         if accelerate:
             point = ellipticcurve.AbstractPoint.from_bytes(
-                self.generator.curve(),r)
+                self.generator.curve(), r)
             r = point[0] % n
         if r < 1 or r > n - 1:
             return False
@@ -272,7 +272,7 @@ def sign(self, hash, random_k, accelerate=False):
         if s == 0:
             raise RSZeroError("amazingly unlucky random number s")
         if accelerate:
-            return Signature(p1,s)
+            return Signature(p1, s)
         return Signature(r, s)
 
 

src/ecdsa/keys.py

@@ -23,7 +23,7 @@
 )
 from ._compat import normalise_bytes
 from .errors import MalformedPointError
-from .ellipticcurve import AbstractPoint, Point, PointJacobi, CurveEdTw
+from .ellipticcurve import PointJacobi, CurveEdTw
 
 
 __all__ = [
@@ -683,7 +683,8 @@ def verify(
 
         hashfunc = hashfunc or self.default_hashfunc
         digest = hashfunc(data).digest()
-        return self.verify_digest(signature, digest, sigdecode, allow_truncate, accelerate)
+        return self.verify_digest(
+            signature, digest, sigdecode, allow_truncate, accelerate)
 
     def verify_digest(
         self,
@@ -1537,7 +1538,8 @@ def sign(
         if isinstance(self.curve.curve, CurveEdTw):
             return self.sign_deterministic(data)
         h = hashfunc(data).digest()
-        return self.sign_digest(h, entropy, sigencode, k, allow_truncate, accelerate)
+        return self.sign_digest(
+            h, entropy, sigencode, k, allow_truncate, accelerate)
 
     def sign_digest(
         self,

src/ecdsa/util.py

@@ -319,8 +319,8 @@ def sigencode_der_sig_value_y_boolean(r, s, order):
     if y & 1:
         b = True
     return der.encode_sequence(der.encode_integer(r),
-                                der.encode_integer(s),
-                                der.encode_boolean(b))
+                               der.encode_integer(s),
+                               der.encode_boolean(b))
 
 
 def sigencode_der_full_r(r, s, order=None, encoding='raw'):
@@ -348,7 +348,8 @@ def sigencode_der_full_r(r, s, order=None, encoding='raw'):
     :rtype: bytes
     """
     r = r.to_bytes(encoding=encoding)
-    sig = der.encode_sequence(der.encode_octet_string(r), der.encode_integer(s))
+    sig = der.encode_sequence(
+        der.encode_octet_string(r), der.encode_integer(s))
     # the ECDSA-FULL-R in ECDSA-Signature has a tag [0]
     sig = der.encode_implicit(0, sig)
     return sig
@@ -671,7 +672,7 @@ def sigdecode_der_ecdsa_sig_value(sig_der, order):
         r = der.integer_to_octet_string(r)
         # In point compression True is odd b"\x03", False is even b"\x02"
         if y:
-            r = b"\x03"  + r
+            r = b"\x03" + r
         else:
             r = b"\x02" + r
     elif optional[:1] == b"\x04":