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/hazmat/primitives/utils.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/hazmat/primitives/utils.py')
| -rw-r--r-- | tests/hazmat/primitives/utils.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/tests/hazmat/primitives/utils.py b/tests/hazmat/primitives/utils.py index 31491023..a29ef70e 100644 --- a/tests/hazmat/primitives/utils.py +++ b/tests/hazmat/primitives/utils.py @@ -14,21 +14,19 @@ from __future__ import absolute_import, division, print_function import binascii -import os - import itertools +import os import pytest +from cryptography.exceptions import ( + AlreadyFinalized, AlreadyUpdated, InvalidTag, NotYetFinalized +) from cryptography.hazmat.primitives import hashes, hmac -from cryptography.hazmat.primitives.asymmetric import rsa, padding -from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC +from cryptography.hazmat.primitives.asymmetric import padding, rsa from cryptography.hazmat.primitives.ciphers import Cipher from cryptography.hazmat.primitives.kdf.hkdf import HKDF - -from cryptography.exceptions import ( - AlreadyFinalized, NotYetFinalized, AlreadyUpdated, InvalidTag, -) +from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC from ...utils import load_vectors_from_file |