aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAyrx <terrycwk1994@gmail.com>2014-04-21 19:12:03 +0800
committerAyrx <terrycwk1994@gmail.com>2014-04-22 12:12:41 +0800
commit3f695110b27afc05f0a9e9e6dc0bfd6e67501418 (patch)
treec6c4f472d653f59ade6c7b444c8f6b4e72abcfdc
parentdbefd58fb00b4de02a0f6803f767d10561478459 (diff)
downloadcryptography-3f695110b27afc05f0a9e9e6dc0bfd6e67501418.tar.gz
cryptography-3f695110b27afc05f0a9e9e6dc0bfd6e67501418.tar.bz2
cryptography-3f695110b27afc05f0a9e9e6dc0bfd6e67501418.zip
Fix pep8 errors
-rw-r--r--cryptography/hazmat/backends/openssl/backend.py2
-rw-r--r--tests/conftest.py2
-rw-r--r--tests/hazmat/primitives/test_cmac.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/cryptography/hazmat/backends/openssl/backend.py b/cryptography/hazmat/backends/openssl/backend.py
index 11731133..0692492b 100644
--- a/cryptography/hazmat/backends/openssl/backend.py
+++ b/cryptography/hazmat/backends/openssl/backend.py
@@ -25,7 +25,7 @@ from cryptography.exceptions import (
UnsupportedAlgorithm, _Reasons
)
from cryptography.hazmat.backends.interfaces import (
- CipherBackend, CMACBackend, DSABackend, HMACBackend, HashBackend,
+ CMACBackend, CipherBackend, DSABackend, HMACBackend, HashBackend,
PBKDF2HMACBackend, RSABackend
)
from cryptography.hazmat.bindings.openssl.binding import Binding
diff --git a/tests/conftest.py b/tests/conftest.py
index 6ba8ae0a..d55e6cf6 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -17,7 +17,7 @@ import pytest
from cryptography.hazmat.backends import _available_backends
from cryptography.hazmat.backends.interfaces import (
- CipherBackend, CMACBackend, DSABackend, HMACBackend, HashBackend,
+ CMACBackend, CipherBackend, DSABackend, HMACBackend, HashBackend,
PBKDF2HMACBackend, RSABackend
)
from .utils import check_backend_support, check_for_iface, select_backends
diff --git a/tests/hazmat/primitives/test_cmac.py b/tests/hazmat/primitives/test_cmac.py
index dd7f9df4..25568114 100644
--- a/tests/hazmat/primitives/test_cmac.py
+++ b/tests/hazmat/primitives/test_cmac.py
@@ -32,7 +32,7 @@ from cryptography.hazmat.primitives.ciphers.algorithms import (
from cryptography.hazmat.primitives.cmac import CMAC
from tests.utils import (
- load_vectors_from_file, load_nist_vectors, raises_unsupported_algorithm
+ load_nist_vectors, load_vectors_from_file, raises_unsupported_algorithm
)
vectors_aes128 = load_vectors_from_file(