Merge branch 'master' into 455-move-boilerplate-timeout-retry-docs-fr…

…om-docstrings
googleapis · Jun 9, 2021 · 435c4e4 · 435c4e4
2 parents 4bb0001 + 2c87f2f
commit 435c4e4
Show file tree

Hide file tree

Showing 4 changed files with 355 additions and 452 deletions.
diff --git a/google/cloud/storage/bucket.py b/google/cloud/storage/bucket.py
@@ -2969,7 +2969,7 @@ def generate_upload_policy(self, conditions, expiration=None, client=None):
                   to attach the signature.
         """
         client = self._require_client(client)
-        credentials = client._base_connection.credentials
+        credentials = client._credentials
         _signing.ensure_signed_credentials(credentials)
 
         if expiration is None: