summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Paul Calderone <exarkun@twistedmatrix.com>2014-01-18 13:21:52 -0500
committerJean-Paul Calderone <exarkun@twistedmatrix.com>2014-01-18 13:21:52 -0500
commitc76c61cc62bda98e3e5ad62fe4e970603a96ae42 (patch)
tree2c4202e39ee6c526f0096e04fa9ed5323eadbb3b
parentfab157b0b40d1d97b5bee6642f87b852ffe04173 (diff)
downloadpyopenssl-c76c61cc62bda98e3e5ad62fe4e970603a96ae42.tar.gz
Accommodate Python 3.2
-rw-r--r--OpenSSL/test/test_ssl.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSSL/test/test_ssl.py b/OpenSSL/test/test_ssl.py
index 572b963..e366b47 100644
--- a/OpenSSL/test/test_ssl.py
+++ b/OpenSSL/test/test_ssl.py
@@ -14,6 +14,8 @@ from os.path import join
from unittest import main
from weakref import ref
+from six import u
+
from OpenSSL.crypto import TYPE_RSA, FILETYPE_PEM
from OpenSSL.crypto import PKey, X509, X509Extension, X509Store
from OpenSSL.crypto import dump_privatekey, load_privatekey
@@ -1076,7 +1078,7 @@ class ContextTests(TestCase, _LoopbackMixin):
able to choose from.
"""
context = Context(TLSv1_METHOD)
- context.set_cipher_list(u"hello world:EXP-RC4-MD5")
+ context.set_cipher_list(u("hello world:EXP-RC4-MD5"))
conn = Connection(context, None)
self.assertEquals(conn.get_cipher_list(), ["EXP-RC4-MD5"])