aboutsummaryrefslogtreecommitdiffstats
path: root/tests/utils.py
diff options
context:
space:
mode:
authorAlex Stapleton <alexs@prol.etari.at>2014-03-14 20:03:12 +0000
committerAlex Stapleton <alexs@prol.etari.at>2014-03-24 09:46:47 +0000
commita39a319b096b1b2b1775ae1a91117c19422a6c81 (patch)
treeda7d4dbf73d815f835dcf38a4d62d73b742480d2 /tests/utils.py
parent68e77c752b94c2531f83589c1bb2060c5ed0d886 (diff)
downloadcryptography-a39a319b096b1b2b1775ae1a91117c19422a6c81.tar.gz
cryptography-a39a319b096b1b2b1775ae1a91117c19422a6c81.tar.bz2
cryptography-a39a319b096b1b2b1775ae1a91117c19422a6c81.zip
Move cryptography.vectors to cryptography_vectors
All vectors are now stored in the subpackage in the vectors/ folder. This package is automatically installed by setup.py test and will also be uploaded with a matching version number by the PyPI upload task.
Diffstat (limited to 'tests/utils.py')
-rw-r--r--tests/utils.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/utils.py b/tests/utils.py
index 226d64fd..3e35970e 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -15,9 +15,11 @@ from __future__ import absolute_import, division, print_function
import collections
+import pytest
+
import six
-import pytest
+import cryptography_vectors
HashVector = collections.namedtuple("HashVector", ["message", "digest"])
@@ -66,9 +68,8 @@ def check_backend_support(item):
def load_vectors_from_file(filename, loader):
- from cryptography import vectors
- vector_file = vectors.open_vector_file('hazmat', 'primitives', filename)
- return loader(vector_file)
+ with cryptography_vectors.open_vector_file(filename) as vector_file:
+ return loader(vector_file)
def load_nist_vectors(vector_data):