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/conftest.py | |
| 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/conftest.py')
| -rw-r--r-- | tests/conftest.py | 2 |
1 files changed, 1 insertions, 1 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) |