summaryrefslogtreecommitdiff
path: root/tests/type/test_univ.py
diff options
context:
space:
mode:
authorHugo van Kemenade <hugovk@users.noreply.github.com>2019-11-16 21:31:31 +0200
committerIlya Etingof <etingof@gmail.com>2019-11-16 20:31:31 +0100
commitfcf7c502c49033a31ed27678fd4b93655e9f6f82 (patch)
treef0c22c4be1c93fd707243990fe4cf3496b2e6441 /tests/type/test_univ.py
parenta7d2ac036866e5f437bd6f9a9f01723f601b4073 (diff)
downloadpyasn1-git-fcf7c502c49033a31ed27678fd4b93655e9f6f82.tar.gz
Add support for Python 3.8, drop EOL 3.4 (#182)
* Drop support for EOL Python 3.4 * Remove Py2.5 workarounds * Change Travis setup to test on default Xenial * Add support for Python 3.8 and update changelog
Diffstat (limited to 'tests/type/test_univ.py')
-rw-r--r--tests/type/test_univ.py22
1 files changed, 1 insertions, 21 deletions
diff --git a/tests/type/test_univ.py b/tests/type/test_univ.py
index 7d2b098..04923bb 100644
--- a/tests/type/test_univ.py
+++ b/tests/type/test_univ.py
@@ -143,21 +143,11 @@ class NoValueTestCase(BaseTestCase):
def testSizeOf(self):
try:
- if hasattr(sys, 'getsizeof'):
- sys.getsizeof(univ.noValue)
-
- # TODO: remove when Py2.5 support is gone
- elif sys.version_info > (2, 6):
- raise unittest.SkipTest("no sys.getsizeof() method")
+ sys.getsizeof(univ.noValue)
except PyAsn1Error:
assert False, 'sizeof failed for NoValue object'
- except TypeError:
- # TODO: remove when Py2.5 support is gone
- if sys.version_info > (2, 6):
- raise unittest.SkipTest("sys.getsizeof() raises TypeError")
-
class IntegerTestCase(BaseTestCase):
def testStr(self):
@@ -557,11 +547,6 @@ class OctetStringUnicodeErrorTestCase(BaseTestCase):
except PyAsn1UnicodeEncodeError:
pass
- # TODO: remove when Py2.5 support is gone
- else:
- if sys.version_info > (2, 6):
- assert False, 'Unicode encoding error not caught'
-
def testDecodeError(self):
serialized = ints2octs((0xff, 0xfe))
@@ -577,11 +562,6 @@ class OctetStringUnicodeErrorTestCase(BaseTestCase):
except PyAsn1UnicodeDecodeError:
pass
- # TODO: remove when Py2.5 support is gone
- else:
- if sys.version_info > (2, 6):
- assert False, 'Unicode decoding error not caught'
-
class OctetStringWithUtf8TestCase(OctetStringWithUnicodeMixIn, BaseTestCase):
initializer = (208, 176, 208, 177, 208, 178)