aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Reid <dreid@dreid.org>2014-02-12 10:43:13 -0800
committerDavid Reid <dreid@dreid.org>2014-02-12 10:43:13 -0800
commitd3a061a3d3b2b856cf7c839b19739e20235b4962 (patch)
treeaf97f06637ecaa0252725e0f6693ca78b4ea69c2
parentd0f37ea8da57daf9f4f9d60490d1aa3c41dd8845 (diff)
parente2d45452119e3992513605f2b32d37d37093abaf (diff)
downloadcryptography-d3a061a3d3b2b856cf7c839b19739e20235b4962.tar.gz
cryptography-d3a061a3d3b2b856cf7c839b19739e20235b4962.tar.bz2
cryptography-d3a061a3d3b2b856cf7c839b19739e20235b4962.zip
Merge pull request #599 from alex/import-sort
Sort our imports
-rw-r--r--cryptography/fernet.py2
-rw-r--r--cryptography/hazmat/backends/openssl/backend.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/cryptography/fernet.py b/cryptography/fernet.py
index c19309d5..71a9fadf 100644
--- a/cryptography/fernet.py
+++ b/cryptography/fernet.py
@@ -22,8 +22,8 @@ import six
from cryptography.exceptions import InvalidSignature
from cryptography.hazmat.backends import default_backend
from cryptography.hazmat.primitives import padding, hashes
-from cryptography.hazmat.primitives.hmac import HMAC
from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
+from cryptography.hazmat.primitives.hmac import HMAC
class InvalidToken(Exception):
diff --git a/cryptography/hazmat/backends/openssl/backend.py b/cryptography/hazmat/backends/openssl/backend.py
index d8869328..fc3c3bda 100644
--- a/cryptography/hazmat/backends/openssl/backend.py
+++ b/cryptography/hazmat/backends/openssl/backend.py
@@ -22,15 +22,15 @@ from cryptography.exceptions import (
from cryptography.hazmat.backends.interfaces import (
CipherBackend, HashBackend, HMACBackend, PBKDF2HMACBackend, RSABackend
)
+from cryptography.hazmat.bindings.openssl.binding import Binding
from cryptography.hazmat.primitives import interfaces, hashes
+from cryptography.hazmat.primitives.asymmetric import rsa
from cryptography.hazmat.primitives.ciphers.algorithms import (
AES, Blowfish, Camellia, TripleDES, ARC4,
)
from cryptography.hazmat.primitives.ciphers.modes import (
CBC, CTR, ECB, OFB, CFB, GCM,
)
-from cryptography.hazmat.bindings.openssl.binding import Binding
-from cryptography.hazmat.primitives.asymmetric import rsa
@utils.register_interface(CipherBackend)