summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Paul Calderone <exarkun@twistedmatrix.com>2014-04-19 09:45:57 -0400
committerJean-Paul Calderone <exarkun@twistedmatrix.com>2014-04-19 09:45:57 -0400
commiteb86f3ab2d8d237e1369e9308e7df330fa1f8a9e (patch)
tree4ea5811c4815300efdf81e491bc92a67b11eb3db
parent3b04e35e18fb9cb6436bc0e41462c59d488d16d9 (diff)
downloadpyopenssl-eb86f3ab2d8d237e1369e9308e7df330fa1f8a9e.tar.gz
restore python 3.2 compatibility
-rw-r--r--OpenSSL/test/test_crypto.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSSL/test/test_crypto.py b/OpenSSL/test/test_crypto.py
index b288985..ba0055f 100644
--- a/OpenSSL/test/test_crypto.py
+++ b/OpenSSL/test/test_crypto.py
@@ -11,7 +11,7 @@ import os, re
from subprocess import PIPE, Popen
from datetime import datetime, timedelta
-from six import binary_type
+from six import u, b, binary_type
from OpenSSL.crypto import TYPE_RSA, TYPE_DSA, Error, PKey, PKeyType
from OpenSSL.crypto import X509, X509Type, X509Name, X509NameType
@@ -27,7 +27,7 @@ from OpenSSL.crypto import CRL, Revoked, load_crl
from OpenSSL.crypto import NetscapeSPKI, NetscapeSPKIType
from OpenSSL.crypto import (
sign, verify, get_elliptic_curve, get_elliptic_curves)
-from OpenSSL.test.util import TestCase, b
+from OpenSSL.test.util import TestCase
from OpenSSL._util import native, lib
def normalize_certificate_pem(pem):
@@ -3098,7 +3098,7 @@ class EllipticCurveTests(TestCase):
curve = next(iter(curves))
self.assertEqual(curve.name, get_elliptic_curve(curve.name).name)
else:
- self.assertRaises(ValueError, get_elliptic_curve, u"prime256v1")
+ self.assertRaises(ValueError, get_elliptic_curve, u("prime256v1"))
def test_not_a_curve(self):