Merge 3.5 (fix #29519)

This commit is contained in:
Łukasz Langa 2017-02-10 00:16:10 -08:00
commit 57fe245e8c
2 changed files with 5 additions and 2 deletions

View file

@ -106,7 +106,7 @@ class WeakValueDictionary(collections.MutableMapping):
self, *args = args
if len(args) > 1:
raise TypeError('expected at most 1 arguments, got %d' % len(args))
def remove(wr, selfref=ref(self)):
def remove(wr, selfref=ref(self), _atomic_removal=_remove_dead_weakref):
self = selfref()
if self is not None:
if self._iterating:
@ -114,7 +114,7 @@ class WeakValueDictionary(collections.MutableMapping):
else:
# Atomic removal is necessary since this function
# can be called asynchronously by the GC
_remove_dead_weakref(d, wr.key)
_atomic_removal(d, wr.key)
self._remove = remove
# A list of keys to be removed
self._pending_removals = []

View file

@ -57,6 +57,9 @@ Extension Modules
Library
-------
- Issue #29519: Fix weakref spewing exceptions during interpreter shutdown
when used with a rare combination of multiprocessing and custom codecs.
- Issue #29416: Prevent infinite loop in pathlib.Path.mkdir
- Issue #29444: Fixed out-of-bounds buffer access in the group() method of