Skip to content

Commit 629f7b8

Browse files
committed
Merge branch 'main' into fix/distutils_patch
2 parents ed439b8 + e9fd90d commit 629f7b8

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed

docs/changelog.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ Release History
55

66
.. towncrier release notes start
77
8+
v20.35.3 (2025-10-10)
9+
---------------------
10+
11+
Bugfixes - 20.35.3
12+
~~~~~~~~~~~~~~~~~~
13+
- Accept RuntimeError in `test_too_many_open_files`, by :user:`esafak` (:issue:`2935`)
14+
815
v20.35.2 (2025-10-10)
916
---------------------
1017

docs/changelog/2935.bugfix.rst

Lines changed: 0 additions & 1 deletion
This file was deleted.

tests/integration/test_race_condition_simulation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def test_race_condition_simulation():
4747
if "_virtualenv" in sys.modules:
4848
del sys.modules["_virtualenv"]
4949

50-
import _virtualenv # noqa: F401
50+
import _virtualenv # noqa: F401, PLC0415
5151

5252
# Try to trigger find_spec
5353
try:

tests/unit/create/via_global_ref/test_race_condition.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def load_module(old, name):
6161
sys.path.insert(0, tmpdir)
6262
try:
6363
# Import the module
64-
import _virtualenv_test
64+
import _virtualenv_test # noqa: PLC0415
6565

6666
# Get the finder instance
6767
finder = _virtualenv_test.finder
@@ -75,11 +75,15 @@ class MockModule:
7575
__name__ = "distutils.dist"
7676

7777
# Try to call exec_module - this should not raise NameError
78-
mock_old_exec = lambda x: None # noqa: E731
78+
def mock_old_exec(_x):
79+
pass
80+
7981
finder.exec_module(mock_old_exec, MockModule())
8082

8183
# Try to call load_module - this should not raise NameError
82-
mock_old_load = lambda name: MockModule() # noqa: E731
84+
def mock_old_load(_name):
85+
return MockModule()
86+
8387
result = finder.load_module(mock_old_load, "distutils.dist")
8488
assert result.__name__ == "distutils.dist"
8589

0 commit comments

Comments
 (0)