diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-11-27 12:45:52 -0600 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-11-27 12:45:52 -0600 |
| commit | 745e512b283594d86aa5045503f5a797dabcd54c (patch) | |
| tree | d850dd10acab0cf33b3e488047db5b04ae5515a2 /tests | |
| parent | de494b379fb4225928b399db724c23a3ab2b7617 (diff) | |
| parent | fdae070f8bcbeb4902114460f8b37b62ea82df53 (diff) | |
| download | cryptography-745e512b283594d86aa5045503f5a797dabcd54c.tar.gz cryptography-745e512b283594d86aa5045503f5a797dabcd54c.tar.bz2 cryptography-745e512b283594d86aa5045503f5a797dabcd54c.zip | |
Merge pull request #1501 from reaperhulk/change-loader
Alter vector file loader to support passing read mode
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_fernet.py | 5 | ||||
| -rw-r--r-- | tests/utils.py | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/tests/test_fernet.py b/tests/test_fernet.py index 455d985c..5b7a9f98 100644 --- a/tests/test_fernet.py +++ b/tests/test_fernet.py @@ -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, [ diff --git a/tests/utils.py b/tests/utils.py index ad38000b..01ab4e6f 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -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) |