Clean up import statements.

* Remove unused imports.
* Move import statements together at the top of the file.

scripts/build_ffi.py

@@ -26,7 +26,6 @@ from contextlib import contextmanager
 from distutils.util import get_platform
 from cffi import FFI
 import shutil
-import glob
 from wolfcrypt._version import __wolfssl_version__ as version
 
 def local_path(path):

setup.py

@@ -22,12 +22,12 @@
 # pylint: disable=wrong-import-position
 
 import os
+import re
 import sys
 from setuptools import setup, find_packages
 
 os.chdir(os.path.dirname(sys.argv[0]) or ".")
 
-import re
 VERSIONFILE = "wolfcrypt/_version.py"
 verstrline = open(VERSIONFILE, "rt").read()
 VSRE = r"^__version__ = ['\"]([^'\"]*)['\"]"

tests/test_aesgcmstream.py

@@ -23,11 +23,10 @@
 from wolfcrypt._ffi import lib as _lib
 
 if _lib.AESGCM_STREAM_ENABLED:
-    from collections import namedtuple
     import pytest
     from wolfcrypt.utils import t2b
     from wolfcrypt.exceptions import WolfCryptError
-    from binascii import hexlify as b2h, unhexlify as h2b
+    from binascii import hexlify as b2h
     from wolfcrypt.ciphers import AesGcmStream
 
     def test_encrypt():

tests/test_chacha20poly1305.py

@@ -27,7 +27,7 @@ if _lib.CHACHA20_POLY1305_ENABLED:
     import pytest
     from wolfcrypt.utils import t2b
     from wolfcrypt.exceptions import WolfCryptError
-    from binascii import hexlify as b2h, unhexlify as h2b
+    from binascii import unhexlify as h2b
     from wolfcrypt.ciphers import ChaCha20Poly1305
 
     def test_encrypt_decrypt():

tests/test_ciphers.py

@@ -23,8 +23,8 @@
 from collections import namedtuple
 import random
 import pytest
-from wolfcrypt._ffi import ffi as _ffi
 from wolfcrypt._ffi import lib as _lib
+from wolfcrypt.ciphers import MODE_CTR, MODE_ECB, MODE_CBC, WolfCryptError
 from wolfcrypt.utils import t2b, h2b
 import os
 
@@ -43,20 +43,16 @@ if _lib.CHACHA_ENABLED:
     from wolfcrypt.ciphers import ChaCha
 
 if _lib.RSA_ENABLED:
-    from wolfcrypt.ciphers import (RsaPrivate, RsaPublic, HASH_TYPE_SHA256, MGF1SHA256, HASH_TYPE_SHA, MGF1SHA1)
+    from wolfcrypt.ciphers import RsaPrivate, RsaPublic, HASH_TYPE_SHA256, HASH_TYPE_SHA
 
 if _lib.ECC_ENABLED:
-    from wolfcrypt.ciphers import (EccPrivate, EccPublic)
+    from wolfcrypt.ciphers import EccPrivate, EccPublic
 
 if _lib.ED25519_ENABLED:
-    from wolfcrypt.ciphers import (Ed25519Private, Ed25519Public)
+    from wolfcrypt.ciphers import Ed25519Private, Ed25519Public
 
 if _lib.ED448_ENABLED:
-    from wolfcrypt.ciphers import (Ed448Private, Ed448Public)
-
-from wolfcrypt.ciphers import (
-    MODE_CTR, MODE_ECB, MODE_CBC, WolfCryptError
-)
+    from wolfcrypt.ciphers import Ed448Private, Ed448Public
 
 
 @pytest.fixture

tests/test_hashes.py

@@ -22,7 +22,6 @@
 
 from collections import namedtuple
 import pytest
-from wolfcrypt._ffi import ffi as _ffi
 from wolfcrypt._ffi import lib as _lib
 from wolfcrypt.utils import t2b