Make it easier to be Python 2.3 compatible by making that the default
diff --git a/test/test_crypto.py b/test/test_crypto.py
index 28a2eba..aa22cd0 100644
--- a/test/test_crypto.py
+++ b/test/test_crypto.py
@@ -173,18 +173,8 @@
"""
-class _Python23TestCaseHelper:
- # Python 2.3 compatibility.
- def assertTrue(self, *a, **kw):
- return self.failUnless(*a, **kw)
-
- def assertFalse(self, *a, **kw):
- return self.failIf(*a, **kw)
-
-
-
-class X509ExtTests(TestCase, _Python23TestCaseHelper):
+class X509ExtTests(TestCase):
def test_construction(self):
"""
L{X509Extension} accepts an extension type name, a critical flag,
@@ -245,7 +235,7 @@
-class PKeyTests(TestCase, _Python23TestCaseHelper):
+class PKeyTests(TestCase):
"""
Unit tests for L{OpenSSL.crypto.PKey}.
"""
@@ -345,7 +335,7 @@
-class X509NameTests(TestCase, _Python23TestCaseHelper):
+class X509NameTests(TestCase):
"""
Unit tests for L{OpenSSL.crypto.X509Name}.
"""
@@ -560,7 +550,7 @@
-class X509ReqTests(TestCase, _PKeyInteractionTestsMixin, _Python23TestCaseHelper):
+class X509ReqTests(TestCase, _PKeyInteractionTestsMixin):
"""
Tests for L{OpenSSL.crypto.X509Req}.
"""
@@ -614,7 +604,7 @@
-class X509Tests(TestCase, _PKeyInteractionTestsMixin, _Python23TestCaseHelper):
+class X509Tests(TestCase, _PKeyInteractionTestsMixin):
"""
Tests for L{OpenSSL.crypto.X509}.
"""
@@ -742,7 +732,7 @@
-class FunctionTests(TestCase, _Python23TestCaseHelper):
+class FunctionTests(TestCase):
"""
Tests for free-functions in the L{OpenSSL.crypto} module.
"""
diff --git a/test/test_ssl.py b/test/test_ssl.py
index 1aa2f95..70b008a 100644
--- a/test/test_ssl.py
+++ b/test/test_ssl.py
@@ -17,7 +17,7 @@
from OpenSSL.SSL import OP_NO_SSLv2, OP_NO_SSLv3, OP_SINGLE_DH_USE
from OpenSSL.SSL import VERIFY_PEER, VERIFY_FAIL_IF_NO_PEER_CERT, VERIFY_CLIENT_ONCE
from OpenSSL.test.util import TestCase
-from OpenSSL.test.test_crypto import _Python23TestCaseHelper, cleartextCertificatePEM, cleartextPrivateKeyPEM
+from OpenSSL.test.test_crypto import cleartextCertificatePEM, cleartextPrivateKeyPEM
try:
from OpenSSL.SSL import OP_NO_QUERY_MTU
except ImportError:
@@ -32,7 +32,7 @@
OP_NO_TICKET = None
-class ContextTests(TestCase, _Python23TestCaseHelper):
+class ContextTests(TestCase):
"""
Unit tests for L{OpenSSL.SSL.Context}.
"""