fix: address code review feedback on base class types, import order and remove lazy imports test

Author: hebaalazzeh

packages/google-auth/google/auth/transport/grpc.py

@@ -17,7 +17,6 @@
 from __future__ import absolute_import
 
 import logging
-from typing import Set
 
 from google.auth import exceptions
 from google.auth.transport import _mtls_helper
@@ -33,18 +32,8 @@
 
 _LOGGER = logging.getLogger(__name__)
 
-# PEP 0810: Explicit Lazy Imports
-# Python 3.15+ natively intercepts and defers these imports.
-# Developers can disable this behavior and force eager imports.
-# For more information, see:
-# https://docs.python.org/3.15/library/sys.html#sys.set_lazy_imports_filter
-# Older Python versions safely ignore this variable.
-__lazy_modules__: Set[str] = {"grpc"}
 
-
-# Inheriting from object instead of grpc.AuthMetadataPlugin is intentional.
-# This prevents eagerly loading grpc at module import time, preserving lazy loading support.
-class AuthMetadataPlugin(object):
+class AuthMetadataPlugin(grpc.AuthMetadataPlugin):
     """A `gRPC AuthMetadataPlugin`_ that inserts the credentials into each
     request.
 
@@ -62,6 +51,10 @@ class AuthMetadataPlugin(object):
     """
 
     def __init__(self, credentials, request, default_host=None):
+        # pylint: disable=no-value-for-parameter
+        # pylint doesn't realize that the super method takes no arguments
+        # because this class is the same name as the superclass.
+        super(AuthMetadataPlugin, self).__init__()
         self._credentials = credentials
         self._request = request
         self._default_host = default_host

packages/google-auth/google/auth/transport/requests.py

@@ -25,6 +25,15 @@
 from typing import Optional, Set
 
 
+# PEP 0810: Explicit Lazy Imports
+# Python 3.15+ natively intercepts and defers these imports.
+# Developers can disable this behavior and force eager imports.
+# For more information, see:
+# https://docs.python.org/3.15/library/sys.html#sys.set_lazy_imports_filter
+# Older Python versions safely ignore this variable.
+__lazy_modules__: Set[str] = {"requests", "requests.adapters", "requests.exceptions"}
+
+
 if importlib.util.find_spec("requests") is None:
     raise ImportError(
         "The requests library is not installed, please install the requests package to use the requests transport."
@@ -44,14 +53,6 @@
 import google.auth.transport._mtls_helper
 from google.oauth2 import service_account
 
-# PEP 0810: Explicit Lazy Imports
-# Python 3.15+ natively intercepts and defers these imports.
-# Developers can disable this behavior and force eager imports.
-# For more information, see:
-# https://docs.python.org/3.15/library/sys.html#sys.set_lazy_imports_filter
-# Older Python versions safely ignore this variable.
-__lazy_modules__: Set[str] = {"requests", "requests.adapters", "requests.exceptions"}
-
 _LOGGER = logging.getLogger(__name__)
 
 _DEFAULT_TIMEOUT = 120  # in seconds
@@ -94,9 +95,11 @@ class TimeoutGuard(object):
             :class:`requests.exceptions.Timeout`.
     """
 
-    def __init__(self, timeout, timeout_error_type=requests.exceptions.Timeout):
+    def __init__(self, timeout, timeout_error_type=None):
         self._timeout = timeout
         self.remaining_timeout = timeout
+        if timeout_error_type is None:
+            timeout_error_type = requests.exceptions.Timeout
         self._timeout_error_type = timeout_error_type
 
     def __enter__(self):

packages/google-auth/google/auth/transport/urllib3.py

@@ -19,7 +19,6 @@
 
 import http.client as http_client
 import logging
-from typing import Set
 import warnings
 
 # Certifi is Mozilla's certificate bundle. Urllib3 needs a certificate bundle
@@ -58,19 +57,10 @@
 from google.auth.transport import _mtls_helper
 from google.oauth2 import service_account
 
-# PEP 0810: Explicit Lazy Imports
-# Python 3.15+ natively intercepts and defers these imports.
-# Developers can disable this behavior and force eager imports.
-# For more information, see:
-# https://docs.python.org/3.15/library/sys.html#sys.set_lazy_imports_filter
-# Older Python versions safely ignore this variable.
-__lazy_modules__: Set[str] = {
-    "urllib3",
-    "urllib3.exceptions",
-    "certifi",
-    "packaging",
-    "packaging.version",
-}
+if version.parse(urllib3.__version__) >= version.parse("2.0.0"):  # pragma: NO COVER
+    RequestMethods = urllib3._request_methods.RequestMethods  # type: ignore
+else:  # pragma: NO COVER
+    RequestMethods = urllib3.request.RequestMethods  # type: ignore
 
 
 _LOGGER = logging.getLogger(__name__)
@@ -215,7 +205,7 @@ def _make_mutual_tls_http(cert, key):
     return http
 
 
-class AuthorizedHttp(object):
+class AuthorizedHttp(RequestMethods):  # type: ignore
     """A urllib3 HTTP class with credentials.
 
     This class is used to perform requests to API endpoints that require
@@ -298,32 +288,6 @@ def my_cert_callback():
             account credentials.
     """
 
-    _encode_url_methods = {"DELETE", "GET", "HEAD", "OPTIONS"}
-    _request_methods_class = None
-
-    def __getattr__(self, name):
-        if name in ("request", "request_encode_url", "request_encode_body"):
-            import types
-
-            if AuthorizedHttp._request_methods_class is None:
-                if version.parse(urllib3.__version__) >= version.parse("2.0.0"):
-                    AuthorizedHttp._request_methods_class = (
-                        urllib3._request_methods.RequestMethods
-                    )
-                else:
-                    AuthorizedHttp._request_methods_class = (
-                        urllib3.request.RequestMethods
-                    )
-
-            method = getattr(AuthorizedHttp._request_methods_class, name)
-            bound_method = types.MethodType(method, self)
-            setattr(self, name, bound_method)
-            return bound_method
-
-        raise AttributeError(
-            f"'{self.__class__.__name__}' object has no attribute '{name}'"
-        )
-
     def __init__(
         self,
         credentials,