aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-03-15 09:31:47 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2014-03-15 09:31:47 -0700
commit0d377e3fd03a2765ce5723c56800745671a45d22 (patch)
tree317208d44155fec3bac8d855e9b718c98780747d
parentd49eae65a42ea08719253bed400fe81203bf7d38 (diff)
downloadcryptography-0d377e3fd03a2765ce5723c56800745671a45d22.tar.gz
cryptography-0d377e3fd03a2765ce5723c56800745671a45d22.tar.bz2
cryptography-0d377e3fd03a2765ce5723c56800745671a45d22.zip
Small style cleanup for imports
-rw-r--r--cryptography/hazmat/primitives/kdf/hkdf.py4
-rw-r--r--cryptography/hazmat/primitives/kdf/pbkdf2.py5
-rw-r--r--tests/hazmat/primitives/test_hkdf.py4
-rw-r--r--tests/hazmat/primitives/test_pbkdf2hmac.py5
4 files changed, 8 insertions, 10 deletions
diff --git a/cryptography/hazmat/primitives/kdf/hkdf.py b/cryptography/hazmat/primitives/kdf/hkdf.py
index 10739178..95396fe1 100644
--- a/cryptography/hazmat/primitives/kdf/hkdf.py
+++ b/cryptography/hazmat/primitives/kdf/hkdf.py
@@ -17,8 +17,8 @@ import six
from cryptography import utils
from cryptography.exceptions import (
- AlreadyFinalized, InvalidKey, UnsupportedInterface)
-
+ AlreadyFinalized, InvalidKey, UnsupportedInterface
+)
from cryptography.hazmat.backends.interfaces import HMACBackend
from cryptography.hazmat.primitives import constant_time, hmac, interfaces
diff --git a/cryptography/hazmat/primitives/kdf/pbkdf2.py b/cryptography/hazmat/primitives/kdf/pbkdf2.py
index fcfe601a..f70a7ddf 100644
--- a/cryptography/hazmat/primitives/kdf/pbkdf2.py
+++ b/cryptography/hazmat/primitives/kdf/pbkdf2.py
@@ -17,9 +17,8 @@ import six
from cryptography import utils
from cryptography.exceptions import (
- InvalidKey, UnsupportedHash, AlreadyFinalized,
- UnsupportedInterface)
-
+ InvalidKey, UnsupportedHash, AlreadyFinalized, UnsupportedInterface
+)
from cryptography.hazmat.backends.interfaces import PBKDF2HMACBackend
from cryptography.hazmat.primitives import constant_time, interfaces
diff --git a/tests/hazmat/primitives/test_hkdf.py b/tests/hazmat/primitives/test_hkdf.py
index 42c75c65..963fb69c 100644
--- a/tests/hazmat/primitives/test_hkdf.py
+++ b/tests/hazmat/primitives/test_hkdf.py
@@ -18,8 +18,8 @@ import six
import pytest
from cryptography.exceptions import (
- AlreadyFinalized, InvalidKey, UnsupportedInterface)
-
+ AlreadyFinalized, InvalidKey, UnsupportedInterface
+)
from cryptography.hazmat.primitives import hashes
from cryptography.hazmat.primitives.kdf.hkdf import HKDF
diff --git a/tests/hazmat/primitives/test_pbkdf2hmac.py b/tests/hazmat/primitives/test_pbkdf2hmac.py
index a47d879e..bf1e7f14 100644
--- a/tests/hazmat/primitives/test_pbkdf2hmac.py
+++ b/tests/hazmat/primitives/test_pbkdf2hmac.py
@@ -18,9 +18,8 @@ import six
from cryptography import utils
from cryptography.exceptions import (
- InvalidKey, UnsupportedHash, AlreadyFinalized,
- UnsupportedInterface)
-
+ InvalidKey, UnsupportedHash, AlreadyFinalized, UnsupportedInterface
+)
from cryptography.hazmat.primitives import hashes, interfaces
from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
from cryptography.hazmat.backends import default_backend