diff --git a/Lib/test/test_unittest/testmock/testmock.py b/Lib/test/test_unittest/testmock/testmock.py index 764585ec5d54688..ef69f060886d0a4 100644 --- a/Lib/test/test_unittest/testmock/testmock.py +++ b/Lib/test/test_unittest/testmock/testmock.py @@ -2108,6 +2108,15 @@ def test_mock_open_after_eof(self): self.assertEqual([], h.readlines()) self.assertEqual([], h.readlines()) + def test_mock_open_exit_with_contextlib_exit_stack(self): + # gh-150484: mock_open's __exit__ should work when called from + # contextlib.ExitStack, which passes (exctype, excinst, exctb). + from contextlib import ExitStack + with mock.patch('builtins.open', mock.mock_open()) as m: + with ExitStack() as exit_stack: + with exit_stack.enter_context(open('/tmp/test.txt', 'w')): + pass + def test_mock_parents(self): for Klass in Mock, MagicMock: m = Klass() diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py index 56cdc37942d65d8..10d6a428e1fa56b 100644 --- a/Lib/unittest/mock.py +++ b/Lib/unittest/mock.py @@ -3002,7 +3002,7 @@ def _next_side_effect(): return handle.readline.return_value return next(_state[0]) - def _exit_side_effect(exctype, excinst, exctb): + def _exit_side_effect(*args): handle.close() global file_spec diff --git a/Misc/NEWS.d/next/Library/2026-05-28-00-00-00.gh-issue-150484.XxYyZz.rst b/Misc/NEWS.d/next/Library/2026-05-28-00-00-00.gh-issue-150484.XxYyZz.rst new file mode 100644 index 000000000000000..522c70058ed29d7 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-05-28-00-00-00.gh-issue-150484.XxYyZz.rst @@ -0,0 +1 @@ +Fix :func:`unittest.mock.mock_open` ``__exit__`` raising ``TypeError`` when used with :class:`contextlib.ExitStack`.