Skip to content
Permalink
Browse files
fix: fix python-api-core dependency issue (#931)
`ClientOptions` doesn't have `client_encryted_cert_source` property yet. Check the existence of the property before accessing it.
  • Loading branch information
arithmetic1728 committed Jun 2, 2020
1 parent cafb9e0 commit 42028ed2b2be47f85b70eb813185264f1f573d01
Showing with 6 additions and 2 deletions.
  1. +5 鈭1 googleapiclient/discovery.py
  2. +1 鈭1 setup.py
@@ -441,7 +441,11 @@ def build_from_document(
raise MutualTLSChannelError(
"ClientOptions.client_cert_source is not supported, please use ClientOptions.client_encrypted_cert_source."
)
if client_options and client_options.client_encrypted_cert_source:
if (
client_options
and hasattr(client_options, "client_encrypted_cert_source")
and client_options.client_encrypted_cert_source
):
client_cert_to_use = client_options.client_encrypted_cert_source
elif adc_cert_path and adc_key_path and mtls.has_default_client_cert_source():
client_cert_to_use = mtls.default_client_encrypted_cert_source(
@@ -41,7 +41,7 @@
"httplib2>=0.9.2,<1dev",
"google-auth>=1.16.0",
"google-auth-httplib2>=0.0.3",
"google-api-core>=1.13.0,<2dev",
"google-api-core>=1.17.0,<2dev",
"six>=1.6.1,<2dev",
"uritemplate>=3.0.0,<4dev",
]

0 comments on commit 42028ed

Please sign in to comment.