Issue #22653: Fix an assertion failure in debug mode when doing a reentrant dict...

author Antoine Pitrou <solipsis@pitrou.net>

Fri, 17 Oct 2014 22:35:44 +0000 (00:35 +0200)

committer Antoine Pitrou <solipsis@pitrou.net>

Fri, 17 Oct 2014 22:35:44 +0000 (00:35 +0200)
author Antoine Pitrou <solipsis@pitrou.net>
Fri, 17 Oct 2014 22:35:44 +0000 (00:35 +0200)
committer Antoine Pitrou <solipsis@pitrou.net>
Fri, 17 Oct 2014 22:35:44 +0000 (00:35 +0200)
diff --cc Misc/NEWS
Simple merge
diff --cc Objects/dictobject.c
Simple merge
author	Antoine Pitrou <solipsis@pitrou.net>
	Fri, 17 Oct 2014 22:35:44 +0000 (00:35 +0200)
committer	Antoine Pitrou <solipsis@pitrou.net>
	Fri, 17 Oct 2014 22:35:44 +0000 (00:35 +0200)
		1	2
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
Objects/dictobject.c	patch \|	diff1 \|	diff2 \|	blob \| history