Skip to content

Commit 0b45ec9

Browse files
committed
Merge remote-tracking branch 'origin/master' into remove_multierror
2 parents 3f519f8 + e4c8eb2 commit 0b45ec9

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
strategy:
9595
fail-fast: false
9696
matrix:
97-
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']
97+
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']
9898
check_formatting: ['0']
9999
no_test_requirements: ['0']
100100
extra_name: ['']

src/trio/_path.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ def generate_forwards(cls, attrs: dict[str, object]) -> None:
155155
if attr_name.startswith("_") or attr_name in attrs:
156156
continue
157157

158-
if isinstance(attr, property):
158+
if isinstance(attr, (property, types.ModuleType)):
159159
cls._forward.append(attr_name)
160160
elif isinstance(attr, types.FunctionType):
161161
wrapper = _forward_factory(cls, attr_name, attr)

0 commit comments

Comments
 (0)