diff --git a/Lib/test/test_unittest/testmock/testmock.py b/Lib/test/test_unittest/testmock/testmock.py index 764585ec5d54688..f5b4502b3c4f5e4 100644 --- a/Lib/test/test_unittest/testmock/testmock.py +++ b/Lib/test/test_unittest/testmock/testmock.py @@ -2108,6 +2108,16 @@ def test_mock_open_after_eof(self): self.assertEqual([], h.readlines()) self.assertEqual([], h.readlines()) + def test_mock_open_exit_stack_issue_150484(self): + # Regression test for gh#150484 + # mock_open().__exit__ must accept 4 args (ExitStack passes + # exc_info tuple) while previously it only accepted 3. + from contextlib import ExitStack + with mock.patch('builtins.open', mock.mock_open()): + with mock.mock_open() as m: + with ExitStack() as exit_stack: + exit_stack.enter_context(open('/tmp/test.txt', 'w')) + 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..1eae054c1448879 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(*exc_details): handle.close() global file_spec