Added flake8 as development dependency and fixed reported issues

sybrenstuvel · sybrenstuvel · commit f2c3b4fd619a · 2019-08-04T18:05:23.000+02:00
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -42,6 +42,7 @@ pytest = "^5.0"
 pytest-cov = "^2.7"
 tox = "^3.13"
 mypy = "^0.720"
+flake8 = "^3.7"
 
 
 [build-system]
diff --git a/rsa/__init__.py b/rsa/__init__.py
@@ -39,4 +39,4 @@
 
 __all__ = ["newkeys", "encrypt", "decrypt", "sign", "verify", 'PublicKey',
            'PrivateKey', 'DecryptionError', 'VerificationError',
-           'compute_hash', 'sign_hash']
+           'find_signature_hash', 'compute_hash', 'sign_hash']
diff --git a/rsa/_compat.py b/rsa/_compat.py
@@ -16,8 +16,6 @@
 
 """Python compatibility wrappers."""
 
-import itertools
-import sys
 from struct import pack
 
 
diff --git a/rsa/cli.py b/rsa/cli.py
@@ -37,7 +37,7 @@ def keygen() -> None:
 
     # Parse the CLI options
     parser = optparse.OptionParser(usage='usage: %prog [options] keysize',
-                          description='Generates a new RSA keypair of "keysize" bits.')
+                                   description='Generates a new RSA keypair of "keysize" bits.')
 
     parser.add_option('--pubout', type='string',
                       help='Output filename for the public key. The public key is '
@@ -203,7 +203,7 @@ class EncryptOperation(CryptoOperation):
     operation_progressive = 'encrypting'
 
     def perform_operation(self, indata: bytes, pub_key: rsa.key.AbstractKey,
-            cli_args: Indexable=()):
+                          cli_args: Indexable = ()):
         """Encrypts files."""
         assert isinstance(pub_key, rsa.key.PublicKey)
         return rsa.encrypt(indata, pub_key)
@@ -221,7 +221,7 @@ class DecryptOperation(CryptoOperation):
     key_class = rsa.PrivateKey
 
     def perform_operation(self, indata: bytes, priv_key: rsa.key.AbstractKey,
-            cli_args: Indexable=()):
+                          cli_args: Indexable = ()):
         """Decrypts files."""
         assert isinstance(priv_key, rsa.key.PrivateKey)
         return rsa.decrypt(indata, priv_key)
@@ -244,7 +244,7 @@ class SignOperation(CryptoOperation):
                    'to stdout if this option is not present.')
 
     def perform_operation(self, indata: bytes, priv_key: rsa.key.AbstractKey,
-            cli_args: Indexable):
+                          cli_args: Indexable):
         """Signs files."""
         assert isinstance(priv_key, rsa.key.PrivateKey)
 
@@ -271,7 +271,7 @@ class VerifyOperation(CryptoOperation):
     has_output = False
 
     def perform_operation(self, indata: bytes, pub_key: rsa.key.AbstractKey,
-            cli_args: Indexable):
+                          cli_args: Indexable):
         """Verifies files."""
         assert isinstance(pub_key, rsa.key.PublicKey)
 
diff --git a/rsa/key.py b/rsa/key.py
@@ -118,7 +118,8 @@ def load_pkcs1(cls, keyfile: bytes, format='PEM') -> 'AbstractKey':
         return method(keyfile)
 
     @staticmethod
-    def _assert_format_exists(file_format: str, methods: typing.Mapping[str, typing.Callable]) -> typing.Callable:
+    def _assert_format_exists(file_format: str, methods: typing.Mapping[str, typing.Callable]) \
+            -> typing.Callable:
         """Checks whether the given file format exists in 'methods'.
         """
 
diff --git a/rsa/pkcs1.py b/rsa/pkcs1.py
@@ -33,14 +33,13 @@
 import sys
 import typing
 
+from . import common, transform, core, key
+
 if sys.version_info < (3, 6):
     # Python 3.6 and newer have SHA-3 support. For Python 3.5 we need a third party library.
     # This library monkey-patches the hashlib module so that it looks like Python actually
     # supports SHA-3 natively.
-    import sha3
-
-
-from . import common, transform, core, key
+    import sha3  # noqa: F401
 
 # ASN.1 codes that describe the hash algorithm used.
 HASH_ASN1 = {
diff --git a/rsa/transform.py b/rsa/transform.py
@@ -36,7 +36,7 @@ def bytes2int(raw_bytes: bytes) -> int:
     return int.from_bytes(raw_bytes, 'big', signed=False)
 
 
-def int2bytes(number: int, fill_size: int=0) -> bytes:
+def int2bytes(number: int, fill_size: int = 0) -> bytes:
     """
     Convert an unsigned integer to bytes (big-endian)::
 
