Skip to content

Allowing pyOpenSSL import to fail for GAE. - #1446

Merged
dhermes merged 1 commit into
googleapis:masterfrom
dhermes:fix-1445
Feb 12, 2016
Merged

Allowing pyOpenSSL import to fail for GAE.#1446
dhermes merged 1 commit into
googleapis:masterfrom
dhermes:fix-1445

Conversation

@dhermes

@dhermesdhermes commented Feb 11, 2016

Copy link
Copy Markdown
Contributor

Fixes#1445.

@googlebotgooglebot added the cla: yes This human has signed the Contributor License Agreement. label Feb 11, 2016
@theacodes

theacodes commented Feb 11, 2016

Copy link
Copy Markdown
Contributor

@dhermes ping me when you're ready for review.

@dhermes

dhermes commented Feb 11, 2016

Copy link
Copy Markdown
ContributorAuthor

I am "ready" for review. The AppVeyor fail is noted in #1434

IMO, the coverage drop just needs a pragma no cover. WDYT?

@theacodes

theacodes commented Feb 11, 2016

Copy link
Copy Markdown
Contributor

I think it'd be nice to see a test case for this, if possible.

@theacodestheacodes self-assigned this Feb 11, 2016
@dhermes

dhermes commented Feb 12, 2016

Copy link
Copy Markdown
ContributorAuthor

@jonparrott I have previously implemented tests that mock import failures and the pay-off does not justify the amount that goes in.

Maybe there is a better way and I just don't know how to do it?

@theacodes

theacodes commented Feb 12, 2016

Copy link
Copy Markdown
Contributor

I guess I more want to ensure that _get_pem_key and _get_signature_bytes raises a more useful error than an AttributeError if crypto is not available.

@dhermes

dhermes commented Feb 12, 2016

Copy link
Copy Markdown
ContributorAuthor

OK cool I can add that feature and test for it.

@dhermes

dhermes commented Feb 12, 2016

Copy link
Copy Markdown
ContributorAuthor

@jonparrott PTAL. (Also remind me to squash to the commits before merging.)

theacodes
theacodes reviewed Feb 12, 2016
View reviewed changes
Comment threadgcloud/credentials.py Outdated

return crypto.load_privatekey(crypto.FILETYPE_PEM, pem_text)
if crypto is None:
raise EnvironmentError('pyOpenSSL must be installed to load a '

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

@theacodes

theacodes commented Feb 12, 2016

Copy link
Copy Markdown
Contributor

LGTM with minor nits. You can squash commits if you want, but I don't see an issue with these being separate commits.

@dhermes

dhermes commented Feb 12, 2016

Copy link
Copy Markdown
ContributorAuthor

@jonparrott PTAL

theacodes
theacodes reviewed Feb 12, 2016
View reviewed changes
Comment threadgcloud/credentials.py Outdated
if not isinstance(string_to_sign, six.binary_type):
string_to_sign = string_to_sign.encode('utf-8')
if crypto is None:
raise EnvironmentError('pyOpenSSL must be installed to sign '

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

@theacodes

theacodes commented Feb 12, 2016

Copy link
Copy Markdown
Contributor

Good to go with the tiniest little nit. Feel free to merge once that's fixed and travis is happy.

dhermes added a commit that referenced this pull request Feb 12, 2016
@dhermes
Merge pull request#1446from dhermes/fix-1445
ad88be0
Allowing pyOpenSSL import to fail for GAE.
@dhermes
dhermes merged commit ad88be0 into googleapis:masterFeb 12, 2016
@dhermes
dhermes deleted the fix-1445 branch February 12, 2016 19:28
@dhermesdhermes mentioned this pull request Feb 17, 2016
Merged
atulep pushed a commit that referenced this pull request Apr 6, 2023
@dizcology@busunkim96
add Speech API auto punctuation sample [(#1446)](GoogleCloudPlatform/…
ddd2b69
…python-docs-samples#1446)
* add auto punctuation sample
* correct docstring
atulep pushed a commit that referenced this pull request Apr 6, 2023
@dizcology@busunkim96
add Speech API auto punctuation sample [(#1446)](GoogleCloudPlatform/…
a0d9c55
…python-docs-samples#1446)
* add auto punctuation sample
* correct docstring
atulep pushed a commit that referenced this pull request Apr 18, 2023
@dizcology@busunkim96
add Speech API auto punctuation sample [(#1446)](GoogleCloudPlatform/…
95bcc3c
…python-docs-samples#1446)
* add auto punctuation sample
* correct docstring
parthea pushed a commit that referenced this pull request Oct 22, 2023
@dizcology@busunkim96
add Speech API auto punctuation sample [(#1446)](GoogleCloudPlatform/…
8e49fe8
…python-docs-samples#1446)
* add auto punctuation sample
* correct docstring
parthea pushed a commit that referenced this pull request Mar 6, 2026
@Mattix23@gcf-owl-bot
docs: revise sample for nested schema (#1446)
92c0187
* docs: revise sample for nested schema
* 🦉 Updates from OwlBot post-processor
See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md
* added TODO
Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@theacodestheacodes

Labels

authcla: yesThis human has signed the Contributor License Agreement.packaging

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@dhermes@theacodes@googlebot