Merge remote-tracking branch 'origin/master' into remove_multierror

python-trio · Jan 21, 2024 · 0b45ec9 · 0b45ec9
2 parents 3f519f8 + e4c8eb2
commit 0b45ec9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -94,7 +94,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['pypy-3.9', 'pypy-3.10', '3.8', '3.9', '3.10', '3.11', '3.12-dev', 'pypy-3.9-nightly', 'pypy-3.10-nightly']
+        python: ['pypy-3.9', 'pypy-3.10', '3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.9-nightly', 'pypy-3.10-nightly']
         check_formatting: ['0']
         no_test_requirements: ['0']
         extra_name: ['']

diff --git a/src/trio/_path.py b/src/trio/_path.py
@@ -155,7 +155,7 @@ def generate_forwards(cls, attrs: dict[str, object]) -> None:
             if attr_name.startswith("_") or attr_name in attrs:
                 continue
 
-            if isinstance(attr, property):
+            if isinstance(attr, (property, types.ModuleType)):
                 cls._forward.append(attr_name)
             elif isinstance(attr, types.FunctionType):
                 wrapper = _forward_factory(cls, attr_name, attr)