diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-12-17 07:35:34 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-12-17 07:35:34 -0800 |
| commit | 875b36be29e6bcfd1cb2a9cb216aba49c1d9d2f0 (patch) | |
| tree | 71372f15c53afdd4bf2459e9a4774f3d526075a5 /tests/conftest.py | |
| parent | 4eec0bb4e1d79f107f40b3856f2c9ec76c3eef88 (diff) | |
| parent | a4aa420cc6c0203d201a0f418af68d1f11abbcf5 (diff) | |
| download | cryptography-875b36be29e6bcfd1cb2a9cb216aba49c1d9d2f0.tar.gz cryptography-875b36be29e6bcfd1cb2a9cb216aba49c1d9d2f0.tar.bz2 cryptography-875b36be29e6bcfd1cb2a9cb216aba49c1d9d2f0.zip | |
Merge branch 'master' into no-more-generator
Conflicts:
tests/hazmat/primitives/utils.py
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) |