diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-12-15 22:17:59 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-12-15 22:17:59 -0800 |
| commit | 4a35b7fede2d8e544abfbe9b1ea0d11231da9908 (patch) | |
| tree | 01ef45be7d510501965717ad4a39fd9c54a19053 /tests | |
| parent | c3f7c37f5718b5deb08edb41125d8c7fb3733cfc (diff) | |
| parent | ffb7726fa3042e66e8011fbd17a8b6f83f0c8110 (diff) | |
| download | cryptography-4a35b7fede2d8e544abfbe9b1ea0d11231da9908.tar.gz cryptography-4a35b7fede2d8e544abfbe9b1ea0d11231da9908.tar.bz2 cryptography-4a35b7fede2d8e544abfbe9b1ea0d11231da9908.zip | |
Merge branch 'master' into fernet
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/conftest.py | 2 | ||||
| -rw-r--r-- | tests/hazmat/backends/__init__.py (renamed from tests/hazmat/bindings/__init__.py) | 0 | ||||
| -rw-r--r-- | tests/hazmat/backends/test_openssl.py (renamed from tests/hazmat/bindings/test_openssl.py) | 4 | ||||
| -rw-r--r-- | tests/hazmat/primitives/utils.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/conftest.py b/tests/conftest.py index fab40b14..71662802 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,5 +1,5 @@ def pytest_generate_tests(metafunc): - from cryptography.hazmat.bindings import _ALL_BACKENDS + from cryptography.hazmat.backends import _ALL_BACKENDS if "backend" in metafunc.fixturenames: metafunc.parametrize("backend", _ALL_BACKENDS) diff --git a/tests/hazmat/bindings/__init__.py b/tests/hazmat/backends/__init__.py index e69de29b..e69de29b 100644 --- a/tests/hazmat/bindings/__init__.py +++ b/tests/hazmat/backends/__init__.py diff --git a/tests/hazmat/bindings/test_openssl.py b/tests/hazmat/backends/test_openssl.py index 1eb6f200..962959b9 100644 --- a/tests/hazmat/bindings/test_openssl.py +++ b/tests/hazmat/backends/test_openssl.py @@ -15,8 +15,8 @@ import pytest from cryptography import utils from cryptography.exceptions import UnsupportedAlgorithm -from cryptography.hazmat.bindings import default_backend -from cryptography.hazmat.bindings.openssl.backend import backend, Backend +from cryptography.hazmat.backends import default_backend +from cryptography.hazmat.backends.openssl.backend import backend, Backend from cryptography.hazmat.primitives import interfaces from cryptography.hazmat.primitives.ciphers import Cipher from cryptography.hazmat.primitives.ciphers.algorithms import AES diff --git a/tests/hazmat/primitives/utils.py b/tests/hazmat/primitives/utils.py index 705983a0..b06f9b29 100644 --- a/tests/hazmat/primitives/utils.py +++ b/tests/hazmat/primitives/utils.py @@ -3,7 +3,7 @@ import os import pytest -from cryptography.hazmat.bindings import _ALL_BACKENDS +from cryptography.hazmat.backends import _ALL_BACKENDS from cryptography.hazmat.primitives import hashes, hmac from cryptography.hazmat.primitives.ciphers import Cipher from cryptography.exceptions import ( |