diff options
Diffstat (limited to 'google/auth/crypt/_python_rsa.py')
| -rw-r--r-- | google/auth/crypt/_python_rsa.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/google/auth/crypt/_python_rsa.py b/google/auth/crypt/_python_rsa.py index 1c4a9da..ec30dd0 100644 --- a/google/auth/crypt/_python_rsa.py +++ b/google/auth/crypt/_python_rsa.py @@ -21,13 +21,12 @@ certificates. There is no support for p12 files. from __future__ import absolute_import -import io - from pyasn1.codec.der import decoder from pyasn1_modules import pem from pyasn1_modules.rfc2459 import Certificate from pyasn1_modules.rfc5208 import PrivateKeyInfo import rsa +import six from google.auth import _helpers from google.auth.crypt import base @@ -53,9 +52,9 @@ def _bit_list_to_bytes(bit_list): """ num_bits = len(bit_list) byte_vals = bytearray() - for start in range(0, num_bits, 8): + for start in six.moves.xrange(0, num_bits, 8): curr_bits = bit_list[start : start + 8] - char_val = sum(val * digit for val, digit in zip(_POW2, curr_bits)) + char_val = sum(val * digit for val, digit in six.moves.zip(_POW2, curr_bits)) byte_vals.append(char_val) return bytes(byte_vals) @@ -153,7 +152,7 @@ class RSASigner(base.Signer, base.FromServiceAccountMixin): """ key = _helpers.from_bytes(key) # PEM expects str in Python 3 marker_id, key_bytes = pem.readPemBlocksFromFile( - io.StringIO(key), _PKCS1_MARKER, _PKCS8_MARKER + six.StringIO(key), _PKCS1_MARKER, _PKCS8_MARKER ) # Key is in pkcs1 format. |