aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2013-10-18 17:44:36 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2013-10-18 18:02:20 -0500
commit79c16e9ef8d0454c64310ccd5faa7fd7dca26313 (patch)
treee088ee3dd26be3717317fed52175ed3c55909018 /tests
parent69e0652b1a48815c7d61fed8b625264419ac2796 (diff)
downloadcryptography-79c16e9ef8d0454c64310ccd5faa7fd7dca26313.tar.gz
cryptography-79c16e9ef8d0454c64310ccd5faa7fd7dca26313.tar.bz2
cryptography-79c16e9ef8d0454c64310ccd5faa7fd7dca26313.zip
alphabetical import order and quote consistency...
Diffstat (limited to 'tests')
-rw-r--r--tests/test_utils.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/test_utils.py b/tests/test_utils.py
index b56e106e..e68f6a7f 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -11,10 +11,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import pytest
-
import textwrap
+import pytest
+
from .utils import (load_nist_vectors, load_nist_vectors_from_file,
load_cryptrec_vectors, load_cryptrec_vectors_from_file,
load_openssl_vectors, load_openssl_vectors_from_file, load_hash_vectors,
@@ -387,10 +387,10 @@ def test_load_hash_vectors():
MD = f96b697d7cb7938d525a2f31aaf161d0
""").splitlines()
assert load_hash_vectors(vector_data) == [
- ('', 'd41d8cd98f00b204e9800998ecf8427e'),
- ('61', '0cc175b9c0f1b6a831c399e269772661'),
- ('616263', '900150983cd24fb0d6963f7d28e17f72'),
- ('6d65737361676520646967657374', 'f96b697d7cb7938d525a2f31aaf161d0'),
+ (b"", "d41d8cd98f00b204e9800998ecf8427e"),
+ (b"61", "0cc175b9c0f1b6a831c399e269772661"),
+ (b"616263", "900150983cd24fb0d6963f7d28e17f72"),
+ (b"6d65737361676520646967657374", "f96b697d7cb7938d525a2f31aaf161d0"),
]
@@ -410,8 +410,8 @@ def test_load_hash_vectors_from_file():
test_list = load_hash_vectors_from_file("RFC/MD5/rfc-1321.txt")
assert len(test_list) == 7
assert test_list[:4] == [
- ('', 'd41d8cd98f00b204e9800998ecf8427e'),
- ('61', '0cc175b9c0f1b6a831c399e269772661'),
- ('616263', '900150983cd24fb0d6963f7d28e17f72'),
- ('6d65737361676520646967657374', 'f96b697d7cb7938d525a2f31aaf161d0'),
+ (b"", "d41d8cd98f00b204e9800998ecf8427e"),
+ (b"61", "0cc175b9c0f1b6a831c399e269772661"),
+ (b"616263", "900150983cd24fb0d6963f7d28e17f72"),
+ (b"6d65737361676520646967657374", "f96b697d7cb7938d525a2f31aaf161d0"),
]