aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDavid Reid <dreid@dreid.org>2013-10-21 21:30:01 -0700
committerDavid Reid <dreid@dreid.org>2013-10-21 21:30:01 -0700
commitf3421788033b233d1aa51eae08c4fbe7b9748536 (patch)
tree2db541bb92b728b5809d6e079d3bc6af3dab777f /tests
parent49b15bf1e2691338c60cb05ab06714b9f3136c81 (diff)
parentafdddcac0a991a30293de6e65d2ac398d3a56b47 (diff)
downloadcryptography-f3421788033b233d1aa51eae08c4fbe7b9748536.tar.gz
cryptography-f3421788033b233d1aa51eae08c4fbe7b9748536.tar.bz2
cryptography-f3421788033b233d1aa51eae08c4fbe7b9748536.zip
Merge pull request #161 from alex/flake8
Enable all the flake8
Diffstat (limited to 'tests')
-rw-r--r--tests/primitives/test_utils.py5
-rw-r--r--tests/test_utils.py10
2 files changed, 9 insertions, 6 deletions
diff --git a/tests/primitives/test_utils.py b/tests/primitives/test_utils.py
index 9888309e..6e197923 100644
--- a/tests/primitives/test_utils.py
+++ b/tests/primitives/test_utils.py
@@ -1,7 +1,8 @@
import pytest
-from .utils import (base_hash_test, encrypt_test, hash_test,
- long_string_hash_test)
+from .utils import (
+ base_hash_test, encrypt_test, hash_test, long_string_hash_test
+)
class TestEncryptTest(object):
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 3fe9e570..f96cf004 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -15,10 +15,12 @@ import textwrap
import pytest
-from .utils import (load_nist_vectors, load_nist_vectors_from_file,
- load_cryptrec_vectors, load_cryptrec_vectors_from_file,
- load_openssl_vectors, load_openssl_vectors_from_file, load_hash_vectors,
- load_hash_vectors_from_file)
+from .utils import (
+ load_nist_vectors, load_nist_vectors_from_file, load_cryptrec_vectors,
+ load_cryptrec_vectors_from_file, load_openssl_vectors,
+ load_openssl_vectors_from_file, load_hash_vectors,
+ load_hash_vectors_from_file
+)
def test_load_nist_vectors_encrypt():