summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorRobert Collins <rbtcollins@hp.com>2015-07-14 23:49:43 (GMT)
committerRobert Collins <rbtcollins@hp.com>2015-07-14 23:49:43 (GMT)
commit76d508b5d4bc8d69433956d6ee6309bbc31f3cf7 (patch)
tree361d08e22e4c9a0f854eb8354f2b51c16d0a2c3e /Misc
parentf58f88c4c7df1827a31457da8dbcacd127613ade (diff)
parentb37f43f94b693468d8b3b9dfc84b1930c52a1b61 (diff)
downloadcpython-76d508b5d4bc8d69433956d6ee6309bbc31f3cf7.zip
cpython-76d508b5d4bc8d69433956d6ee6309bbc31f3cf7.tar.gz
cpython-76d508b5d4bc8d69433956d6ee6309bbc31f3cf7.tar.bz2
- Issue #18622: unittest.mock.mock_open().reset_mock would recurse infinitely.
Patch from Nicola Palumbo and Laurent De Buyst.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS2
-rw-r--r--Misc/NEWS3
2 files changed, 5 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 9841059..2dc6411 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1582,3 +1582,5 @@ Gennadiy Zlobin
Doug Zongker
Peter Åstrand
Ignacio Rossi
+Laurent De Buyst
+Nicola Palumbo
diff --git a/Misc/NEWS b/Misc/NEWS
index 2a5b447..77c898c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -17,6 +17,9 @@ Core and Builtins
Library
-------
+- Issue #18622: unittest.mock.mock_open().reset_mock would recurse infinitely.
+ Patch from Nicola Palumbo and Laurent De Buyst.
+
- Issue #23661: unittest.mock side_effects can now be exceptions again. This
was a regression vs Python 3.4. Patch from Ignacio Rossi