diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-03-16 13:12:50 -0430 |
---|---|---|
committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-03-16 13:12:50 -0430 |
commit | 8322039ff723260c3ce5d10c98a0dfde29470319 (patch) | |
tree | b0c680e1fc44ef198c6eb77fae29722d15cb4c77 /tests/hazmat/primitives | |
parent | 563896ff3544c99c13596f46897e16c0b58fc9ab (diff) | |
parent | f70f017501516dca0d9ca69b9b6a19820d82ab42 (diff) | |
download | cryptography-8322039ff723260c3ce5d10c98a0dfde29470319.tar.gz cryptography-8322039ff723260c3ce5d10c98a0dfde29470319.tar.bz2 cryptography-8322039ff723260c3ce5d10c98a0dfde29470319.zip |
Merge pull request #811 from alex/import-style
Tiny style changes to some imports
Diffstat (limited to 'tests/hazmat/primitives')
-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 |
4 files changed, 2 insertions, 8 deletions
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 |