summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorRobert Collins <rbtcollins@hp.com>2015-07-14 23:42:28 (GMT)
committerRobert Collins <rbtcollins@hp.com>2015-07-14 23:42:28 (GMT)
commitb37f43f94b693468d8b3b9dfc84b1930c52a1b61 (patch)
tree172fa92019a9728252f64417321ecb9fee36cef4 /Misc
parentacb3a4d88bdee64096ed4f00c9d464b6b4513658 (diff)
downloadcpython-b37f43f94b693468d8b3b9dfc84b1930c52a1b61.zip
cpython-b37f43f94b693468d8b3b9dfc84b1930c52a1b61.tar.gz
cpython-b37f43f94b693468d8b3b9dfc84b1930c52a1b61.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 b377050..63cf4da 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1533,3 +1533,5 @@ Tarek Ziadé
Gennadiy Zlobin
Doug Zongker
Peter Ã…strand
+Laurent De Buyst
+Nicola Palumbo
diff --git a/Misc/NEWS b/Misc/NEWS
index bdbd74e..874bbd9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -66,6 +66,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 #24608: chunk.Chunk.read() now always returns bytes, not str.
- Issue #18684: Fixed reading out of the buffer in the re module.