This repository has been archived by the owner on Nov 5, 2019. It is now read-only.
Check for OpenSSL.crypto when detecting OpenSSL. #191
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| _, _package_dir, _ = imp.find_module('OpenSSL') | ||
| if not (os.path.isfile(os.path.join(_package_dir, 'crypto.py')) or | ||
| os.path.isfile(os.path.join(_package_dir, 'crypto.so'))): | ||
| raise ImportError('No module named OpenSSL.crypto') |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
Previously, we assumed that anyone using `OpenSSL` would have installed it via a mechanism like `pip`; this has come back to bite us. We modify our code to look for `OpenSSL.crypto`, not just `OpenSSL`, and add another (unpleasant) test. Fixes googleapis#190.
craigcitro
force-pushed
the
openssl_detection
branch
from
50ad080 to
df8f98e
Compare
|
PTAL |
|
LGTM. |
craigcitro
added a commit
that referenced
this pull request
May 26, 2015
Check for OpenSSL.crypto when detecting OpenSSL.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, we assumed that anyone using
OpenSSLwould have installed it viaa mechanism like
pip; this has come back to bite us.We modify our code to look for
OpenSSL.crypto, not justOpenSSL, and addanother (unpleasant) test.
Fixes #190.
PTAL @dhermes