diff options
| -rw-r--r-- | CHANGES.rst | 1 | ||||
| -rw-r--r-- | pyasn1/compat/integer.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 5cf1df6..2217faa 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -3,6 +3,7 @@ Revision 0.3.3, released XX-08-2017 ----------------------------------- - Fixed SetOf ordering at CER/DER encoder +- Fixed crash on conditional binascii module import Revision 0.3.2, released 04-08-2017 ----------------------------------- diff --git a/pyasn1/compat/integer.py b/pyasn1/compat/integer.py index c3c23e7..11992c3 100644 --- a/pyasn1/compat/integer.py +++ b/pyasn1/compat/integer.py @@ -12,11 +12,11 @@ try: except (ImportError, AttributeError): implementation = 'CPython' -if sys.version_info[0:2] < (3, 2): - from binascii import a2b_hex, b2a_hex from pyasn1.compat.octets import oct2int, null, ensureString if sys.version_info[0:2] < (3, 2) or implementation != 'CPython': + from binascii import a2b_hex, b2a_hex + if sys.version_info[0] > 2: long = int |