diff options
author | Pat Ferate <pferate@gmail.com> | 2014-07-17 21:12:41 -0700 |
---|---|---|
committer | Pat Ferate <pferate@gmail.com> | 2014-07-17 21:12:41 -0700 |
commit | 503bc2ec6f650a2e3a7b0aa03bf050024011c137 (patch) | |
tree | c1f16ab6ce2cc3f2d8a418f0b5c80d07b6865e62 /oauth2client/crypt.py | |
parent | e42c11da83050624a08a98fd7575c6cb5206e153 (diff) | |
download | oauth2client-503bc2ec6f650a2e3a7b0aa03bf050024011c137.tar.gz |
Fixed str -> bytes conversion
Diffstat (limited to 'oauth2client/crypt.py')
-rwxr-xr-x | oauth2client/crypt.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/oauth2client/crypt.py b/oauth2client/crypt.py index 0f5cdc0..9ba8099 100755 --- a/oauth2client/crypt.py +++ b/oauth2client/crypt.py @@ -117,7 +117,7 @@ try: signed_message = crypto.sign(self._key, message, 'sha256') except TypeError: # Failed as str, so let's try with bytes (probably 0.14+) - message = bytes.decode(message) + message = str.encode(message) signed_message = crypto.sign(self._key, message, 'sha256') return signed_message @@ -146,7 +146,7 @@ try: pkey = crypto.load_pkcs12(key, password).get_privatekey() except TypeError: # Failed as str, so let's try with bytes (probably 0.14+) - password = bytes.decode(password) + message = str.encode(password) pkey = crypto.load_pkcs12(key, password).get_privatekey() return OpenSSLSigner(pkey) |