summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Paul Calderone <exarkun@divmod.com>2011-09-14 11:02:05 -0400
committerJean-Paul Calderone <exarkun@divmod.com>2011-09-14 11:02:05 -0400
commitd440a083e0077c5e3cbeafa6092bccdc4b2b29da (patch)
tree6926a5390466e42d84312d07df79a64bdf4f3bf4
parentbfac21719aeab888d99eb0d77317aff1f7a81613 (diff)
downloadpyopenssl-d440a083e0077c5e3cbeafa6092bccdc4b2b29da.tar.gz
Python 3.x compatibility
-rw-r--r--OpenSSL/test/test_crypto.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSSL/test/test_crypto.py b/OpenSSL/test/test_crypto.py
index cc0ede2..e0d7b27 100644
--- a/OpenSSL/test/test_crypto.py
+++ b/OpenSSL/test/test_crypto.py
@@ -2016,14 +2016,14 @@ class FunctionTests(TestCase):
def test_load_privatekey_wrongPassphraseCallback(self):
"""
- :py:obj:`load_privatekey` raises :py:obj:`OpenSSL.crypto.Error` when it is passed an
- encrypted PEM and a passphrase callback which returns an incorrect
- passphrase.
+ :py:obj:`load_privatekey` raises :py:obj:`OpenSSL.crypto.Error` when it
+ is passed an encrypted PEM and a passphrase callback which returns an
+ incorrect passphrase.
"""
called = []
def cb(*a):
called.append(None)
- return "quack"
+ return b("quack")
self.assertRaises(
Error,
load_privatekey, FILETYPE_PEM, encryptedPrivateKeyPEM, cb)