saymrwulf/cryptography
1
0
Fork 0
mirror of https://github.com/saymrwulf/cryptography.git synced 2026-05-14 20:37:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

alter vector file loader to support passing read mode

Browse source
This commit is contained in:
Paul Kehrer 2014-11-27 07:50:46 -10:00
parent a28874863a
commit fdae070f8b
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tests/test_fernet.py
View file

@ -7,6 +7,7 @@ from __future__ import absolute_import, division, print_function
import base64
import calendar
import json
import os
import time
import iso8601
@ -24,7 +25,9 @@ import cryptography_vectors
def json_parametrize(keys, filename):
vector_file = cryptography_vectors.open_vector_file('fernet', filename)
vector_file = cryptography_vectors.open_vector_file(
os.path.join('fernet', filename), "r"
)
with vector_file:
data = json.load(vector_file)
return pytest.mark.parametrize(keys, [

4
tests/utils.py
View file

@ -87,8 +87,8 @@ def der_encode_dsa_signature(r, s):
return encoder.encode(sig)
def load_vectors_from_file(filename, loader):
with cryptography_vectors.open_vector_file(filename) as vector_file:
def load_vectors_from_file(filename, loader, mode="r"):
with cryptography_vectors.open_vector_file(filename, mode) as vector_file:
return loader(vector_file)

4
vectors/cryptography_vectors/__init__.py
View file

@ -18,6 +18,6 @@ __all__ = [
]
def open_vector_file(*args):
def open_vector_file(filename, mode):
base = os.path.dirname(__file__)
return open(os.path.join(base, *args), "r")
return open(os.path.join(base, filename), mode)