refactor: apply PEP 810 directly to transport modules instead of __init__ to fully address parthea's feedback

Author: hebaalazzeh

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

@@ -26,25 +26,6 @@
 
 import abc
 import http.client as http_client
-from typing import 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] = {
-    "_aiohttp_requests",
-    "_custom_tls_signer",
-    "_http_client",
-    "_mtls_helper",
-    "_requests_base",
-    "grpc",
-    "mtls",
-    "requests",
-    "urllib3",
-}
 
 DEFAULT_RETRYABLE_STATUS_CODES = (
     http_client.INTERNAL_SERVER_ERROR,
@@ -121,49 +102,3 @@ def __call__(
         # pylint: disable=redundant-returns-doc, missing-raises-doc
         # (pylint doesn't play well with abstract docstrings.)
         raise NotImplementedError("__call__ must be implemented.")
-
-
-try:
-    from google.auth.transport import _aiohttp_requests  # noqa: F401, E402
-except ImportError:
-    pass
-
-try:
-    from google.auth.transport import _custom_tls_signer  # noqa: F401, E402
-except ImportError:
-    pass
-
-try:
-    from google.auth.transport import _http_client  # noqa: F401, E402
-except ImportError:
-    pass
-
-try:
-    from google.auth.transport import _mtls_helper  # noqa: F401, E402
-except ImportError:
-    pass
-
-try:
-    from google.auth.transport import _requests_base  # noqa: F401, E402
-except ImportError:
-    pass
-
-try:
-    from google.auth.transport import grpc  # noqa: F401, E402
-except ImportError:
-    pass
-
-try:
-    from google.auth.transport import mtls  # noqa: F401, E402
-except ImportError:
-    pass
-
-try:
-    from google.auth.transport import requests  # noqa: F401, E402
-except ImportError:
-    pass
-
-try:
-    from google.auth.transport import urllib3  # noqa: F401, E402
-except ImportError:
-    pass

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

@@ -16,6 +16,10 @@
 
 from __future__ import absolute_import
 
+from typing import Set
+
+__lazy_modules__: Set[str] = {"grpc"}
+
 import logging
 
 from google.auth import exceptions

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

@@ -16,6 +16,10 @@
 
 from __future__ import absolute_import
 
+from typing import Set
+
+__lazy_modules__: Set[str] = {'requests', 'requests.adapters', 'requests.exceptions'}
+
 import functools
 import http.client as http_client
 import logging

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

@@ -16,6 +16,10 @@
 
 from __future__ import absolute_import
 
+from typing import Set
+
+__lazy_modules__: Set[str] = {"urllib3", "urllib3.exceptions", "certifi", "packaging", "packaging.version"}
+
 import http.client as http_client
 import logging
 import warnings

packages/google-auth/tests/transport/test_lazy_imports.py

@@ -19,41 +19,38 @@
 
 SCRIPT_PYTHON_315 = """
 import sys
-import google.auth.transport
+import google.auth.transport.requests
+import google.auth.transport.urllib3
+import google.auth.transport.grpc
 
-LAZY_MODULES = [
-    "google.auth.transport.requests",
-    "google.auth.transport.urllib3",
-    "google.auth.transport.grpc",
-]
+# The heavy underlying modules should NOT be loaded yet
+HEAVY_MODULES = ["requests", "urllib3", "grpc"]
 
-for mod in LAZY_MODULES:
+for mod in HEAVY_MODULES:
     if mod in sys.modules:
         print(f"FAILED: {mod} was eagerly loaded into sys.modules")
         sys.exit(1)
 
-from google.auth.transport import requests
+# Trigger reification
+import requests
 _ = requests.__name__
 
-if "google.auth.transport.requests" not in sys.modules:
-    print("FAILED: google.auth.transport.requests was not lazily loaded upon access")
+if "requests" not in sys.modules:
+    print("FAILED: requests was not lazily loaded upon access")
     sys.exit(2)
 
 sys.exit(0)
 """
 
 SCRIPT_PRE_315 = """
 import sys
-import google.auth.transport
-from google.auth.transport import requests
+import google.auth.transport.requests
+import google.auth.transport.urllib3
+import google.auth.transport.grpc
 
-LAZY_MODULES = [
-    "google.auth.transport.requests",
-    "google.auth.transport.urllib3",
-    "google.auth.transport.grpc",
-]
+HEAVY_MODULES = ["requests", "urllib3", "grpc"]
 
-for mod in LAZY_MODULES:
+for mod in HEAVY_MODULES:
     if mod not in sys.modules:
         print(f"FAILED: {mod} was not eagerly loaded into sys.modules")
         sys.exit(1)