granicus.if.org Git - python/commit

]> granicus.if.org Git - python/commit

projects / python / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f58f88c b37f43f)

author	Robert Collins <rbtcollins@hp.com>
	Tue, 14 Jul 2015 23:49:43 +0000 (11:49 +1200)
committer	Robert Collins <rbtcollins@hp.com>
	Tue, 14 Jul 2015 23:49:43 +0000 (11:49 +1200)
commit	76d508b5d4bc8d69433956d6ee6309bbc31f3cf7
tree	361d08e22e4c9a0f854eb8354f2b51c16d0a2c3e	tree \| snapshot
parent	f58f88c4c7df1827a31457da8dbcacd127613ade	commit \| diff
parent	b37f43f94b693468d8b3b9dfc84b1930c52a1b61	commit \| diff

- Issue #18622: unittest.mock.mock_open().reset_mock would recurse infinitely.

Patch from Nicola Palumbo and Laurent De Buyst.

Lib/unittest/mock.py	diff1 \|	diff2 \|	blob \| history
Lib/unittest/test/testmock/testmock.py	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.