aboutsummaryrefslogtreecommitdiffstats
path: root/tests/hazmat/primitives/test_pbkdf2hmac.py
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-03-19 12:58:19 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2014-03-19 12:58:19 -0700
commit62e18d7873470517c97c0c37be6bc1a81c304d8a (patch)
treec04e5d850c274e323196c3d71067f3b7fb278689 /tests/hazmat/primitives/test_pbkdf2hmac.py
parent2ed93e28aed5737f7cb54807e60d9a0e7d85b4f3 (diff)
parent8443a92f9fb168b7b9bd38cd2bb4dea315f90eaf (diff)
downloadcryptography-62e18d7873470517c97c0c37be6bc1a81c304d8a.tar.gz
cryptography-62e18d7873470517c97c0c37be6bc1a81c304d8a.tar.bz2
cryptography-62e18d7873470517c97c0c37be6bc1a81c304d8a.zip
Merge pull request #829 from reaperhulk/import-order-fixer
import order fixes for future automated checking
Diffstat (limited to 'tests/hazmat/primitives/test_pbkdf2hmac.py')
-rw-r--r--tests/hazmat/primitives/test_pbkdf2hmac.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/hazmat/primitives/test_pbkdf2hmac.py b/tests/hazmat/primitives/test_pbkdf2hmac.py
index bf1e7f14..585693ea 100644
--- a/tests/hazmat/primitives/test_pbkdf2hmac.py
+++ b/tests/hazmat/primitives/test_pbkdf2hmac.py
@@ -18,11 +18,11 @@ import six
from cryptography import utils
from cryptography.exceptions import (
- InvalidKey, UnsupportedHash, AlreadyFinalized, UnsupportedInterface
+ AlreadyFinalized, InvalidKey, UnsupportedHash, UnsupportedInterface
)
+from cryptography.hazmat.backends import default_backend
from cryptography.hazmat.primitives import hashes, interfaces
from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
-from cryptography.hazmat.backends import default_backend
@utils.register_interface(interfaces.HashAlgorithm)