Avoid clunky TYPE_CHECKING checks

Author: A5rocks

src/trio/__init__.py

@@ -112,8 +112,7 @@
 
 from . import _deprecate as _deprecate
 
-if not TYPE_CHECKING:
-    __getattr__ = _deprecate.getattr_for_deprecated_attributes(__name__, {})
+_deprecate.deprecate_attributes(__name__, {})
 
 # Having the public path in .__module__ attributes is important for:
 # - exception names in printed tracebacks

src/trio/_deprecate.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import sys
 import warnings
 from functools import wraps
 from typing import TYPE_CHECKING, ClassVar, TypeVar
@@ -148,7 +149,7 @@ class DeprecatedAttribute:
     instead: object = _not_set
 
 
-def getattr_for_deprecated_attributes(
+def deprecate_attributes(
     module_name: str, deprecated_attributes: dict[str, DeprecatedAttribute]
 ) -> Callable[[str], object]:
     def __getattr__(name: str) -> object:
@@ -164,4 +165,4 @@ def __getattr__(name: str) -> object:
         msg = "module '{}' has no attribute '{}'"
         raise AttributeError(msg.format(module_name, name))
 
-    return __getattr__
+    sys.modules[module_name].__getattr__ = __getattr__

src/trio/_tests/module_with_deprecations.py

@@ -1,27 +1,22 @@
 regular = "hi"
 
-# Make sure that we don't trigger infinite recursion when accessing module
-# attributes in between calling enable_attribute_deprecations and defining
-# __deprecated_attributes__:
 import sys
-from typing import TYPE_CHECKING
 
 from .. import _deprecate
 
+_deprecate.deprecate_attributes(
+    __name__,
+    {
+        "dep1": _deprecate.DeprecatedAttribute("value1", "1.1", issue=1),
+        "dep2": _deprecate.DeprecatedAttribute(
+            "value2",
+            "1.2",
+            issue=1,
+            instead="instead-string",
+        ),
+    },
+)
+
 this_mod = sys.modules[__name__]
 assert this_mod.regular == "hi"
-assert not hasattr(this_mod, "dep1")
-
-if not TYPE_CHECKING:
-    __getattr__ = _deprecate.getattr_for_deprecated_attributes(
-        __name__,
-        {
-            "dep1": _deprecate.DeprecatedAttribute("value1", "1.1", issue=1),
-            "dep2": _deprecate.DeprecatedAttribute(
-                "value2",
-                "1.2",
-                issue=1,
-                instead="instead-string",
-            ),
-        },
-    )
+assert "dep1" not in globals()