From 68e77c752b94c2531f83589c1bb2060c5ed0d886 Mon Sep 17 00:00:00 2001 From: Matthew Iversen Date: Thu, 13 Mar 2014 08:54:43 +1100 Subject: Load vectors from cryptography.vectors --- tests/utils.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'tests/utils.py') 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): -- cgit v1.2.3