diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-04-20 14:41:14 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-04-20 14:41:14 -0700 |
| commit | 8f70f8c94739b0fe9719fc8c1a21f2bcf07a6e13 (patch) | |
| tree | d7473fe07675b66e812fd00ac6ce24bcabccd892 /tests/hazmat | |
| parent | b8ba9e0fe330e213a93bd32b1368bf839d4d9ec7 (diff) | |
| parent | 707b0085cb1034e6a8e6faed6a78bc675b878fd4 (diff) | |
| download | cryptography-8f70f8c94739b0fe9719fc8c1a21f2bcf07a6e13.tar.gz cryptography-8f70f8c94739b0fe9719fc8c1a21f2bcf07a6e13.tar.bz2 cryptography-8f70f8c94739b0fe9719fc8c1a21f2bcf07a6e13.zip | |
Merge pull request #838 from public/import-order-lint
Enable import order linter
Diffstat (limited to 'tests/hazmat')
| -rw-r--r-- | tests/hazmat/primitives/test_dsa.py | 2 | ||||
| -rw-r--r-- | tests/hazmat/primitives/test_pbkdf2hmac.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/hazmat/primitives/test_dsa.py b/tests/hazmat/primitives/test_dsa.py index 2b5d4bb3..bc3b1db6 100644 --- a/tests/hazmat/primitives/test_dsa.py +++ b/tests/hazmat/primitives/test_dsa.py @@ -23,7 +23,7 @@ from cryptography.hazmat.primitives.asymmetric import dsa from cryptography.utils import bit_length from ...utils import ( - load_vectors_from_file, load_fips_dsa_key_pair_vectors, + load_fips_dsa_key_pair_vectors, load_vectors_from_file, raises_unsupported_algorithm ) diff --git a/tests/hazmat/primitives/test_pbkdf2hmac.py b/tests/hazmat/primitives/test_pbkdf2hmac.py index 62ca0921..e928fc6a 100644 --- a/tests/hazmat/primitives/test_pbkdf2hmac.py +++ b/tests/hazmat/primitives/test_pbkdf2hmac.py @@ -14,6 +14,7 @@ from __future__ import absolute_import, division, print_function import pytest + import six from cryptography import utils |