Skip to content

Conversation

dhermes
Copy link
Contributor

@dhermes dhermes commented Feb 17, 2016

Fixes #1477.

@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label Feb 17, 2016
'httplib2 >= 0.9.1',
'googleapis-common-protos',
'oauth2client >= 1.4.6',
'oauth2client >= 2.0.0',

This comment was marked as spam.

@dhermes
Copy link
Contributor Author

dhermes commented Feb 17, 2016

Yeah I plan on upgrading in a subsequent PR

if credentials._private_key_pkcs12 is not None:
# Take our PKCS12 (.p12) text and convert to PEM text.
pem_text = crypt.pkcs12_key_as_pem(
credentials._private_key_pkcs12,

This comment was marked as spam.

This comment was marked as spam.

@tseaver
Copy link
Contributor

tseaver commented Feb 17, 2016

LGTM

dhermes added a commit that referenced this pull request Feb 17, 2016
@dhermes dhermes merged commit 09c3c98 into googleapis:master Feb 17, 2016
@dhermes dhermes deleted the oauth2client-2.0 branch February 17, 2016 15:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
api: core cla: yes This human has signed the Contributor License Agreement. packaging
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants