From 7d67d01e5a487e1be3a73158ff67d38e4ce8aaaa Mon Sep 17 00:00:00 2001 From: ohmayr Date: Wed, 30 Oct 2024 15:46:31 +0000 Subject: [PATCH 1/3] fix: remove base class to avoid type conflict --- google/auth/transport/requests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/google/auth/transport/requests.py b/google/auth/transport/requests.py index 68f67c59b..7b3b8db60 100644 --- a/google/auth/transport/requests.py +++ b/google/auth/transport/requests.py @@ -293,7 +293,7 @@ def proxy_manager_for(self, *args, **kwargs): return super(_MutualTlsOffloadAdapter, self).proxy_manager_for(*args, **kwargs) -class AuthorizedSession(requests.Session, _BaseAuthorizedSession): +class AuthorizedSession(requests.Session): """A Requests Session class with credentials. This class is used to perform requests to API endpoints that require @@ -390,7 +390,7 @@ def __init__( default_host=None, ): super(AuthorizedSession, self).__init__() - _BaseAuthorizedSession.__init__(self, credentials) + self.credentials = credentials self._refresh_status_codes = refresh_status_codes self._max_refresh_attempts = max_refresh_attempts self._refresh_timeout = refresh_timeout From ee8a1b1b7da2257649c27b92e29a62b5736f633a Mon Sep 17 00:00:00 2001 From: ohmayr Date: Wed, 30 Oct 2024 16:00:16 +0000 Subject: [PATCH 2/3] remove unused import --- google/auth/transport/requests.py | 1 - 1 file changed, 1 deletion(-) diff --git a/google/auth/transport/requests.py b/google/auth/transport/requests.py index 7b3b8db60..23a69783d 100644 --- a/google/auth/transport/requests.py +++ b/google/auth/transport/requests.py @@ -38,7 +38,6 @@ from google.auth import exceptions from google.auth import transport import google.auth.transport._mtls_helper -from google.auth.transport._requests_base import _BaseAuthorizedSession from google.oauth2 import service_account _LOGGER = logging.getLogger(__name__) From 529c7c76f2be9e9d7df484b429bf8104f2e769b0 Mon Sep 17 00:00:00 2001 From: ohmayr Date: Wed, 30 Oct 2024 17:15:06 +0000 Subject: [PATCH 3/3] disable coverage --- .coveragerc | 2 ++ google/auth/transport/_requests_base.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.coveragerc b/.coveragerc index 9ba3d3fe6..4192b8cf8 100644 --- a/.coveragerc +++ b/.coveragerc @@ -6,6 +6,8 @@ omit = */samples/* */conftest.py */google-cloud-sdk/lib/* + # NOTE: Temporarily disabling coverage for `_requests_base.py`. + */_requests_base.py exclude_lines = # Re-enable the standard pragma pragma: NO COVER diff --git a/google/auth/transport/_requests_base.py b/google/auth/transport/_requests_base.py index ec718d909..0608223d8 100644 --- a/google/auth/transport/_requests_base.py +++ b/google/auth/transport/_requests_base.py @@ -13,7 +13,8 @@ # limitations under the License. """Transport adapter for Base Requests.""" - +# NOTE: The coverage for this file is temporarily disabled in `.coveragerc` +# since it is currently unused. import abc