Merge pull request #24 from tpazderka/Fix_imports

Fixed imports from builtins for Python2

Author: Roland Hedberg

src/jwkest/aes_gcm.py

@@ -23,10 +23,13 @@
 """
 from __future__ import print_function
 from __future__ import division
-from builtins import str
-from builtins import hex
-from builtins import range
-from builtins import object
+try:
+    from builtins import str
+    from builtins import hex
+    from builtins import range
+    from builtins import object
+except ImportError:
+    pass
 #from past.utils import old_div
 
 from Crypto.Cipher import AES

src/jwkest/aes_key_wrap.py

@@ -16,8 +16,11 @@
 PyCrypto's AES.
 """
 from __future__ import division
-from builtins import hex
-from builtins import range
+try:
+    from builtins import hex
+    from builtins import range
+except ImportError:
+    pass
 import struct
 from Crypto.Cipher import AES
 
@@ -86,4 +89,4 @@ def test():
         "1FA68B0A8112B447AEF34BD8FB5A7B829D3E862371D2CFE5")
     PLAIN = binascii.unhexlify("00112233445566778899AABBCCDDEEFF")
     assert aes_unwrap_key(KEK, CIPHER) == PLAIN
-    assert aes_wrap_key(KEK, PLAIN) == CIPHER
+    assert aes_wrap_key(KEK, PLAIN) == CIPHER

src/jwkest/ecc.py

@@ -3,7 +3,10 @@
 from __future__ import print_function
 from __future__ import absolute_import
 from __future__ import division
-from builtins import object
+try:
+    from builtins import object
+except ImportError:
+    pass
 #from past.utils import old_div
 from Crypto.Util.number import long_to_bytes, bytes_to_long
 from jwkest.elliptic import inv, mulp, sign_bit, y_from_x, muladdp

src/jwkest/elliptic.py

@@ -72,8 +72,11 @@
     Hence there is no addp() and doublep().
 """
 from __future__ import division
-from builtins import zip
-from builtins import range
+try:
+    from builtins import zip
+    from builtins import range
+except ImportError:
+    pass
 #from past.utils import old_div
 
 # BASIC MATH -------------------------------------------------------------------

src/jwkest/extra.py

@@ -1,5 +1,8 @@
 from __future__ import division
-from builtins import bytes
+try:
+    from builtins import bytes
+except ImportError:
+    pass
 #from past.utils import old_div
 from math import ceil
 from struct import pack, unpack
@@ -170,4 +173,3 @@ def ecdh_derive_key(curve, key, epk, apu, apv, alg, dk_len):
         pack("!I", len(apv)) + apv + \
         pack("!I", dk_len)
     return concat_sha256(Z, dk_len, otherInfo)
-