Update oauth2client to v2.0.1 and googleapiclient to v1.5.0.

client/third_party/oauth2client/_openssl_crypt.py

 # Copyright 2015 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 50 matching lines @@
             key_pem: string, public key in PEM format.
             is_x509_cert: bool, True if key_pem is an X509 cert, otherwise it
                           is expected to be an RSA key in PEM format.
 
         Returns:
             Verifier instance.
 
         Raises:
             OpenSSL.crypto.Error: if the key_pem can't be parsed.
         """
+        key_pem = _to_bytes(key_pem)
         if is_x509_cert:
             pubkey = crypto.load_certificate(crypto.FILETYPE_PEM, key_pem)
         else:
             pubkey = crypto.load_privatekey(crypto.FILETYPE_PEM, key_pem)
         return OpenSSLVerifier(pubkey)
 
 
 class OpenSSLSigner(object):
     """Signs messages with a private key."""
 
@@ skipping 24 matching lines @@
         Args:
             key: string, private key in PKCS12 or PEM format.
             password: string, password for the private key file.
 
         Returns:
             Signer instance.
 
         Raises:
             OpenSSL.crypto.Error if the key can't be parsed.
         """
+        key = _to_bytes(key)
         parsed_pem_key = _parse_pem_key(key)
         if parsed_pem_key:
             pkey = crypto.load_privatekey(crypto.FILETYPE_PEM, parsed_pem_key)
         else:
             password = _to_bytes(password, encoding='utf-8')
             pkey = crypto.load_pkcs12(key, password).get_privatekey()
         return OpenSSLSigner(pkey)
 
 
-def pkcs12_key_as_pem(private_key_text, private_key_password):
-    """Convert the contents of a PKCS12 key to PEM using OpenSSL.
+def pkcs12_key_as_pem(private_key_bytes, private_key_password):
+    """Convert the contents of a PKCS#12 key to PEM using pyOpenSSL.
 
     Args:
-        private_key_text: String. Private key.
-        private_key_password: String. Password for PKCS12.
+        private_key_bytes: Bytes. PKCS#12 key in DER format.
+        private_key_password: String. Password for PKCS#12 key.
 
     Returns:
-        String. PEM contents of ``private_key_text``.
+        String. PEM contents of ``private_key_bytes``.
     """
-    decoded_body = base64.b64decode(private_key_text)
     private_key_password = _to_bytes(private_key_password)
-
-    pkcs12 = crypto.load_pkcs12(decoded_body, private_key_password)
+    pkcs12 = crypto.load_pkcs12(private_key_bytes, private_key_password)
     return crypto.dump_privatekey(crypto.FILETYPE_PEM,
                                   pkcs12.get_privatekey())