summaryrefslogtreecommitdiff
path: root/pyasn1
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 /pyasn1
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 'pyasn1')
-rw-r--r--pyasn1/compat/integer.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/pyasn1/compat/integer.py b/pyasn1/compat/integer.py
index df6bed4..968d04f 100644
--- a/pyasn1/compat/integer.py
+++ b/pyasn1/compat/integer.py
@@ -12,12 +12,9 @@ from pyasn1.compat.octets import oct2int, null, ensureString
implementation = platform.python_implementation()
-if sys.version_info[0:2] < (3, 2) or implementation != 'CPython':
+if sys.version_info[0] < 3 or implementation != 'CPython':
from binascii import a2b_hex, b2a_hex
- if sys.version_info[0] > 2:
- long = int
-
def from_bytes(octets, signed=False):
if not octets:
return 0