Skip to content

Commit

Permalink
Allowing pyOpenSSL import to fail for GAE.
Browse files Browse the repository at this point in the history
  • Loading branch information
dhermes committed Feb 11, 2016
1 parent 0910f99 commit 6d85ae0
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion gcloud/credentials.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@
import six
from six.moves.urllib.parse import urlencode # pylint: disable=F0401

from OpenSSL import crypto
try:
from OpenSSL import crypto
except ImportError:
# pyOpenSSL can't be installed on App Engine, but it will not
# be needed there since app_identity is used.
crypto = None

from oauth2client import client
from oauth2client.client import _get_application_default_credential_from_file
Expand Down

0 comments on commit 6d85ae0

Please sign in to comment.