diff options
| author | Matthew Iversen <teh.ivo@gmail.com> | 2014-03-13 08:54:43 +1100 |
|---|---|---|
| committer | Alex Stapleton <alexs@prol.etari.at> | 2014-03-22 16:25:38 +0000 |
| commit | 68e77c752b94c2531f83589c1bb2060c5ed0d886 (patch) | |
| tree | c06d5a42d1a40e894ed7d2d2e95f3292b782614c | |
| parent | 0bd20e264c7e7dfc1ee722664c8b545a4ea64b38 (diff) | |
| download | cryptography-68e77c752b94c2531f83589c1bb2060c5ed0d886.tar.gz cryptography-68e77c752b94c2531f83589c1bb2060c5ed0d886.tar.bz2 cryptography-68e77c752b94c2531f83589c1bb2060c5ed0d886.zip | |
Load vectors from cryptography.vectors
| -rw-r--r-- | cryptography/__init__.py | 2 | ||||
| -rw-r--r-- | tests/test_fernet.py | 9 | ||||
| -rw-r--r-- | tests/utils.py | 13 |
3 files changed, 9 insertions, 15 deletions
diff --git a/cryptography/__init__.py b/cryptography/__init__.py index 6005361f..f27ba856 100644 --- a/cryptography/__init__.py +++ b/cryptography/__init__.py @@ -13,8 +13,6 @@ from __future__ import absolute_import, division, print_function -__import__('pkg_resources').declare_namespace(__name__) - from cryptography.__about__ import ( __author__, __copyright__, __email__, __license__, __summary__, __title__, __uri__, __version__ diff --git a/tests/test_fernet.py b/tests/test_fernet.py index 36e87297..438dc094 100644 --- a/tests/test_fernet.py +++ b/tests/test_fernet.py @@ -16,7 +16,6 @@ from __future__ import absolute_import, division, print_function import base64 import calendar import json -import os import time import iso8601 @@ -30,10 +29,10 @@ from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives.ciphers import algorithms, modes -def json_parametrize(keys, fname): - path = os.path.join(os.path.dirname(__file__), "vectors", "fernet", fname) - with open(path) as f: - data = json.load(f) +def json_parametrize(keys, filename): + from cryptography import vectors + vector_file = vectors.open_vector_file('fernet', filename) + data = json.load(vector_file) return pytest.mark.parametrize(keys, [ tuple([entry[k] for k in keys]) for entry in data diff --git a/tests/utils.py b/tests/utils.py index 79996b6d..226d64fd 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -14,12 +14,11 @@ from __future__ import absolute_import, division, print_function import collections -import os - -import pytest import six +import pytest + HashVector = collections.namedtuple("HashVector", ["message", "digest"]) KeyedHashVector = collections.namedtuple( @@ -67,11 +66,9 @@ def check_backend_support(item): def load_vectors_from_file(filename, loader): - base = os.path.join( - os.path.dirname(__file__), "hazmat", "primitives", "vectors", - ) - with open(os.path.join(base, filename), "r") as vector_file: - return loader(vector_file) + from cryptography import vectors + vector_file = vectors.open_vector_file('hazmat', 'primitives', filename) + return loader(vector_file) def load_nist_vectors(vector_data): |