diff options
author | Ayrx <terrycwk1994@gmail.com> | 2014-02-17 12:26:10 +0800 |
---|---|---|
committer | Ayrx <terrycwk1994@gmail.com> | 2014-02-21 11:13:35 +0800 |
commit | 64a3fbd6365a33fdd5fc247c49831a22aa11a303 (patch) | |
tree | 1c790e179465f07a678dcdceb28c903149dd1e6b | |
parent | ebadb6b293748786c45fb34685b25000be4df2e7 (diff) | |
download | cryptography-64a3fbd6365a33fdd5fc247c49831a22aa11a303.tar.gz cryptography-64a3fbd6365a33fdd5fc247c49831a22aa11a303.tar.bz2 cryptography-64a3fbd6365a33fdd5fc247c49831a22aa11a303.zip |
Final changes to module names
-rw-r--r-- | cryptography/hazmat/primitives/otp/__init__.py (renamed from cryptography/hazmat/oath/__init__.py) | 0 | ||||
-rw-r--r-- | cryptography/hazmat/primitives/otp/hotp.py (renamed from cryptography/hazmat/oath/hotp.py) | 3 | ||||
-rw-r--r-- | tests/hazmat/primitives/otp/__init__.py (renamed from tests/hazmat/oath/__init__.py) | 0 | ||||
-rw-r--r-- | tests/hazmat/primitives/otp/test_hotp.py (renamed from tests/hazmat/oath/test_hotp.py) | 4 |
4 files changed, 4 insertions, 3 deletions
diff --git a/cryptography/hazmat/oath/__init__.py b/cryptography/hazmat/primitives/otp/__init__.py index e69de29b..e69de29b 100644 --- a/cryptography/hazmat/oath/__init__.py +++ b/cryptography/hazmat/primitives/otp/__init__.py diff --git a/cryptography/hazmat/oath/hotp.py b/cryptography/hazmat/primitives/otp/hotp.py index 9f5a0f13..0bc4cc56 100644 --- a/cryptography/hazmat/oath/hotp.py +++ b/cryptography/hazmat/primitives/otp/hotp.py @@ -12,9 +12,10 @@ # limitations under the License. import struct -from cryptography.exceptions import InvalidToken + import six +from cryptography.exceptions import InvalidToken from cryptography.hazmat.primitives import constant_time, hmac from cryptography.hazmat.primitives.hashes import SHA1 diff --git a/tests/hazmat/oath/__init__.py b/tests/hazmat/primitives/otp/__init__.py index e69de29b..e69de29b 100644 --- a/tests/hazmat/oath/__init__.py +++ b/tests/hazmat/primitives/otp/__init__.py diff --git a/tests/hazmat/oath/test_hotp.py b/tests/hazmat/primitives/otp/test_hotp.py index 7b1db93d..2641cb99 100644 --- a/tests/hazmat/oath/test_hotp.py +++ b/tests/hazmat/primitives/otp/test_hotp.py @@ -10,13 +10,13 @@ # implied. # See the License for the specific language governing permissions and # limitations under the License. -from cryptography.exceptions import InvalidToken import os import pytest -from cryptography.hazmat.oath.hotp import HOTP +from cryptography.exceptions import InvalidToken +from cryptography.hazmat.primitives.otp.hotp import HOTP from cryptography.hazmat.primitives import hashes from tests.utils import load_vectors_from_file, load_nist_vectors |