diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-03-19 12:58:19 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-03-19 12:58:19 -0700 |
| commit | 62e18d7873470517c97c0c37be6bc1a81c304d8a (patch) | |
| tree | c04e5d850c274e323196c3d71067f3b7fb278689 /tests/conftest.py | |
| parent | 2ed93e28aed5737f7cb54807e60d9a0e7d85b4f3 (diff) | |
| parent | 8443a92f9fb168b7b9bd38cd2bb4dea315f90eaf (diff) | |
| download | cryptography-62e18d7873470517c97c0c37be6bc1a81c304d8a.tar.gz cryptography-62e18d7873470517c97c0c37be6bc1a81c304d8a.tar.bz2 cryptography-62e18d7873470517c97c0c37be6bc1a81c304d8a.zip | |
Merge pull request #829 from reaperhulk/import-order-fixer
import order fixes for future automated checking
Diffstat (limited to 'tests/conftest.py')
| -rw-r--r-- | tests/conftest.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/conftest.py b/tests/conftest.py index 36183f46..8e89af57 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -17,10 +17,10 @@ import pytest from cryptography.hazmat.backends import _available_backends from cryptography.hazmat.backends.interfaces import ( - HMACBackend, CipherBackend, HashBackend, PBKDF2HMACBackend, RSABackend + CipherBackend, HMACBackend, HashBackend, PBKDF2HMACBackend, RSABackend ) -from .utils import check_for_iface, check_backend_support, select_backends +from .utils import check_backend_support, check_for_iface, select_backends def pytest_generate_tests(metafunc): |