summaryrefslogtreecommitdiff
path: root/tests/test_crypto.py
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2019-11-18 00:18:50 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2019-11-18 13:18:50 +0800
commit1257600e1603ed57455d92758eb1da857cd61725 (patch)
tree5a5829854150a0b092b54803723fa842e6222ad6 /tests/test_crypto.py
parentdaf6f0060959c896fd724da5ade401ec70a8d1e5 (diff)
downloadpyopenssl-git-1257600e1603ed57455d92758eb1da857cd61725.tar.gz
Random cleanup around our usage of binary_type (#879)
Diffstat (limited to 'tests/test_crypto.py')
-rw-r--r--tests/test_crypto.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/test_crypto.py b/tests/test_crypto.py
index 9d943a9..b0e8e8b 100644
--- a/tests/test_crypto.py
+++ b/tests/test_crypto.py
@@ -13,8 +13,6 @@ from datetime import datetime, timedelta
import pytest
-from six import binary_type
-
from cryptography import x509
from cryptography.hazmat.backends.openssl.backend import backend
from cryptography.hazmat.primitives import serialization
@@ -2662,7 +2660,7 @@ class TestFunction(object):
passphrase = b"foo"
key = load_privatekey(FILETYPE_PEM, cleartextPrivateKeyPEM)
pem = dump_privatekey(FILETYPE_PEM, key, GOOD_CIPHER, passphrase)
- assert isinstance(pem, binary_type)
+ assert isinstance(pem, bytes)
loadedKey = load_privatekey(FILETYPE_PEM, pem, passphrase)
assert isinstance(loadedKey, PKey)
assert loadedKey.type() == key.type()
@@ -2802,7 +2800,7 @@ class TestFunction(object):
return passphrase
key = load_privatekey(FILETYPE_PEM, cleartextPrivateKeyPEM)
pem = dump_privatekey(FILETYPE_PEM, key, GOOD_CIPHER, cb)
- assert isinstance(pem, binary_type)
+ assert isinstance(pem, bytes)
assert called == [True]
loadedKey = load_privatekey(FILETYPE_PEM, pem, passphrase)
assert isinstance(loadedKey, PKey)
@@ -2982,7 +2980,7 @@ class TestNetscapeSPKI(_PKeyInteractionTestsMixin):
"""
nspki = NetscapeSPKI()
blob = nspki.b64_encode()
- assert isinstance(blob, binary_type)
+ assert isinstance(blob, bytes)
class TestRevoked(object):