diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-03-19 12:37:17 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-03-19 12:37:17 -0400 |
| commit | 90450f362629872dd2b6756ac0ff55ca8aecf30b (patch) | |
| tree | 46912f200a4e242f7b592dc07ead754ca0603aba | |
| parent | afc1ccdcc86371588328c7894d230c9db3757359 (diff) | |
| download | cryptography-90450f362629872dd2b6756ac0ff55ca8aecf30b.tar.gz cryptography-90450f362629872dd2b6756ac0ff55ca8aecf30b.tar.bz2 cryptography-90450f362629872dd2b6756ac0ff55ca8aecf30b.zip | |
a few small fixes
| -rw-r--r-- | tests/hazmat/primitives/test_hkdf.py | 1 | ||||
| -rw-r--r-- | tests/hazmat/primitives/twofactor/test_hotp.py | 3 | ||||
| -rw-r--r-- | tests/hazmat/primitives/twofactor/test_totp.py | 3 | ||||
| -rw-r--r-- | tests/utils.py | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/tests/hazmat/primitives/test_hkdf.py b/tests/hazmat/primitives/test_hkdf.py index 989709c6..367addc9 100644 --- a/tests/hazmat/primitives/test_hkdf.py +++ b/tests/hazmat/primitives/test_hkdf.py @@ -14,6 +14,7 @@ from __future__ import absolute_import, division, print_function import pytest + import six from cryptography.exceptions import ( diff --git a/tests/hazmat/primitives/twofactor/test_hotp.py b/tests/hazmat/primitives/twofactor/test_hotp.py index 7692a082..4bb7c6b3 100644 --- a/tests/hazmat/primitives/twofactor/test_hotp.py +++ b/tests/hazmat/primitives/twofactor/test_hotp.py @@ -21,7 +21,8 @@ from cryptography.exceptions import InvalidToken, UnsupportedInterface from cryptography.hazmat.primitives import hashes from cryptography.hazmat.primitives.hashes import MD5, SHA1 from cryptography.hazmat.primitives.twofactor.hotp import HOTP -from tests.utils import load_nist_vectors, load_vectors_from_file + +from ....utils import load_nist_vectors, load_vectors_from_file vectors = load_vectors_from_file( "twofactor/rfc-4226.txt", load_nist_vectors) diff --git a/tests/hazmat/primitives/twofactor/test_totp.py b/tests/hazmat/primitives/twofactor/test_totp.py index 0b10c969..d5b0a8ed 100644 --- a/tests/hazmat/primitives/twofactor/test_totp.py +++ b/tests/hazmat/primitives/twofactor/test_totp.py @@ -18,7 +18,8 @@ import pytest from cryptography.exceptions import InvalidToken, UnsupportedInterface from cryptography.hazmat.primitives import hashes from cryptography.hazmat.primitives.twofactor.totp import TOTP -from tests.utils import load_nist_vectors, load_vectors_from_file + +from ....utils import load_nist_vectors, load_vectors_from_file vectors = load_vectors_from_file( "twofactor/rfc-6238.txt", load_nist_vectors) diff --git a/tests/utils.py b/tests/utils.py index 81a86dfc..79996b6d 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -17,6 +17,7 @@ import collections import os import pytest + import six |