diff options
-rw-r--r-- | cryptography/hazmat/primitives/ciphers/base.py | 5 | ||||
-rw-r--r-- | cryptography/hazmat/primitives/hmac.py | 1 | ||||
-rw-r--r-- | tests/hazmat/primitives/test_ciphers.py | 2 | ||||
-rw-r--r-- | tests/hazmat/primitives/test_hashes.py | 1 | ||||
-rw-r--r-- | tests/hazmat/primitives/test_hmac.py | 4 | ||||
-rw-r--r-- | tests/hazmat/primitives/test_rsa.py | 3 |
6 files changed, 4 insertions, 12 deletions
diff --git a/cryptography/hazmat/primitives/ciphers/base.py b/cryptography/hazmat/primitives/ciphers/base.py index 2c804cac..1275019e 100644 --- a/cryptography/hazmat/primitives/ciphers/base.py +++ b/cryptography/hazmat/primitives/ciphers/base.py @@ -15,9 +15,8 @@ from __future__ import absolute_import, division, print_function from cryptography import utils from cryptography.exceptions import ( - AlreadyFinalized, NotYetFinalized, AlreadyUpdated, - UnsupportedInterface) - + AlreadyFinalized, NotYetFinalized, AlreadyUpdated, UnsupportedInterface +) from cryptography.hazmat.backends.interfaces import CipherBackend from cryptography.hazmat.primitives import interfaces diff --git a/cryptography/hazmat/primitives/hmac.py b/cryptography/hazmat/primitives/hmac.py index 18cf7f09..0bcbb3cd 100644 --- a/cryptography/hazmat/primitives/hmac.py +++ b/cryptography/hazmat/primitives/hmac.py @@ -19,7 +19,6 @@ from cryptography import utils from cryptography.exceptions import ( AlreadyFinalized, InvalidSignature, UnsupportedInterface ) - from cryptography.hazmat.backends.interfaces import HMACBackend from cryptography.hazmat.primitives import constant_time, interfaces diff --git a/tests/hazmat/primitives/test_ciphers.py b/tests/hazmat/primitives/test_ciphers.py index e1f5dbc3..bd9625e9 100644 --- a/tests/hazmat/primitives/test_ciphers.py +++ b/tests/hazmat/primitives/test_ciphers.py @@ -18,12 +18,10 @@ import binascii import pytest from cryptography.exceptions import UnsupportedInterface - from cryptography.hazmat.primitives import ciphers from cryptography.hazmat.primitives.ciphers.algorithms import ( AES, Camellia, TripleDES, Blowfish, ARC4, CAST5, IDEA ) - from cryptography.hazmat.primitives.ciphers.modes import ECB diff --git a/tests/hazmat/primitives/test_hashes.py b/tests/hazmat/primitives/test_hashes.py index d74d1d82..5b318f64 100644 --- a/tests/hazmat/primitives/test_hashes.py +++ b/tests/hazmat/primitives/test_hashes.py @@ -23,7 +23,6 @@ from cryptography import utils from cryptography.exceptions import ( AlreadyFinalized, UnsupportedHash, UnsupportedInterface ) - from cryptography.hazmat.backends.interfaces import HashBackend from cryptography.hazmat.primitives import hashes, interfaces diff --git a/tests/hazmat/primitives/test_hmac.py b/tests/hazmat/primitives/test_hmac.py index af177d7a..3589e6ac 100644 --- a/tests/hazmat/primitives/test_hmac.py +++ b/tests/hazmat/primitives/test_hmac.py @@ -21,10 +21,8 @@ import six from cryptography import utils from cryptography.exceptions import ( - AlreadyFinalized, UnsupportedHash, InvalidSignature, - UnsupportedInterface + AlreadyFinalized, UnsupportedHash, InvalidSignature, UnsupportedInterface ) - from cryptography.hazmat.backends.interfaces import HMACBackend from cryptography.hazmat.primitives import hashes, hmac, interfaces diff --git a/tests/hazmat/primitives/test_rsa.py b/tests/hazmat/primitives/test_rsa.py index 155ec3a9..0e88bb7f 100644 --- a/tests/hazmat/primitives/test_rsa.py +++ b/tests/hazmat/primitives/test_rsa.py @@ -23,8 +23,7 @@ import pytest from cryptography import exceptions, utils from cryptography.exceptions import UnsupportedInterface from cryptography.hazmat.primitives import hashes, interfaces -from cryptography.hazmat.primitives.asymmetric import rsa -from cryptography.hazmat.primitives.asymmetric import padding +from cryptography.hazmat.primitives.asymmetric import rsa, padding from ...utils import load_pkcs1_vectors, load_vectors_from_file |