diff options
| author | Donald Stufft <donald@stufft.io> | 2013-10-27 16:52:33 -0400 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2013-10-28 08:37:33 -0400 |
| commit | ce0d781707979ccb7f6983601c5ccb25d2354582 (patch) | |
| tree | f6eab1903394ead5b86d8f05274f43703f5d4dee /tests | |
| parent | f04317ae24441082279ea73ccca0a6630c33cc86 (diff) | |
| download | cryptography-ce0d781707979ccb7f6983601c5ccb25d2354582.tar.gz cryptography-ce0d781707979ccb7f6983601c5ccb25d2354582.tar.bz2 cryptography-ce0d781707979ccb7f6983601c5ccb25d2354582.zip | |
Move the bindings into the hazmat module
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/conftest.py | 2 | ||||
| -rw-r--r-- | tests/hazmat/bindings/__init__.py (renamed from tests/bindings/__init__.py) | 0 | ||||
| -rw-r--r-- | tests/hazmat/bindings/test_openssl.py (renamed from tests/bindings/test_openssl.py) | 2 | ||||
| -rw-r--r-- | tests/hazmat/primitives/test_hashes.py | 3 | ||||
| -rw-r--r-- | tests/hazmat/primitives/utils.py | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/tests/conftest.py b/tests/conftest.py index d2ba03de..fab40b14 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,5 +1,5 @@ def pytest_generate_tests(metafunc): - from cryptography.bindings import _ALL_BACKENDS + from cryptography.hazmat.bindings import _ALL_BACKENDS if "backend" in metafunc.fixturenames: metafunc.parametrize("backend", _ALL_BACKENDS) diff --git a/tests/bindings/__init__.py b/tests/hazmat/bindings/__init__.py index e69de29b..e69de29b 100644 --- a/tests/bindings/__init__.py +++ b/tests/hazmat/bindings/__init__.py diff --git a/tests/bindings/test_openssl.py b/tests/hazmat/bindings/test_openssl.py index 69ab38d0..9ce882e4 100644 --- a/tests/bindings/test_openssl.py +++ b/tests/hazmat/bindings/test_openssl.py @@ -13,7 +13,7 @@ import pytest -from cryptography.bindings.openssl.backend import backend +from cryptography.hazmat.bindings.openssl.backend import backend from cryptography.hazmat.primitives.block.ciphers import AES from cryptography.hazmat.primitives.block.modes import CBC diff --git a/tests/hazmat/primitives/test_hashes.py b/tests/hazmat/primitives/test_hashes.py index 110ca4b7..797fe4ff 100644 --- a/tests/hazmat/primitives/test_hashes.py +++ b/tests/hazmat/primitives/test_hashes.py @@ -19,8 +19,7 @@ import pytest import six -from cryptography.bindings import _default_backend - +from cryptography.hazmat.bindings import _default_backend from cryptography.hazmat.primitives import hashes from .utils import generate_base_hash_test diff --git a/tests/hazmat/primitives/utils.py b/tests/hazmat/primitives/utils.py index 79d0aba4..fabdca01 100644 --- a/tests/hazmat/primitives/utils.py +++ b/tests/hazmat/primitives/utils.py @@ -3,7 +3,7 @@ import os import pytest -from cryptography.bindings import _ALL_BACKENDS +from cryptography.hazmat.bindings import _ALL_BACKENDS from cryptography.hazmat.primitives.block import BlockCipher |