From 17d181f0590b37df2ca5ee2ff1ab6db343b62f33 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Fri, 14 Jul 2017 10:01:09 -0400 Subject: python3: fix weakref spewing exceptions during interp finalization When py3 applications are exiting we often see errors similar to the following: Exception ignored in: .remove at 0x7fcb56b09400> Traceback (most recent call last): File "/usr/lib64/python3.5/weakref.py", line 117, in remove TypeError: 'NoneType' object is not callable After a quick search this was found to be a well reported issue upstream and had an appropriate fix which is backported here. (From OE-Core rev: 8aaf09a916a2f66f1a6a79cbddf45390ecefde4f) Signed-off-by: Mark Asselstine Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...eakref-spewing-exceptions-during-interp-f.patch | 56 ++++++++++++++++++++++ meta/recipes-devtools/python/python3_3.5.3.bb | 1 + 2 files changed, 57 insertions(+) create mode 100644 meta/recipes-devtools/python/python3/Fix-29519-weakref-spewing-exceptions-during-interp-f.patch (limited to 'meta/recipes-devtools/python') diff --git a/meta/recipes-devtools/python/python3/Fix-29519-weakref-spewing-exceptions-during-interp-f.patch b/meta/recipes-devtools/python/python3/Fix-29519-weakref-spewing-exceptions-during-interp-f.patch new file mode 100644 index 0000000000..7217c6edea --- /dev/null +++ b/meta/recipes-devtools/python/python3/Fix-29519-weakref-spewing-exceptions-during-interp-f.patch @@ -0,0 +1,56 @@ +From 62dcf34987b680e95873eb947b3f4d802199c667 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C5=81ukasz=20Langa?= +Date: Fri, 10 Feb 2017 00:14:55 -0800 +Subject: [PATCH] Fix #29519: weakref spewing exceptions during interp + finalization + +commit 9cd7e17640a49635d1c1f8c2989578a8fc2c1de6 +from https://github.com/python/cpython + +Upstream-Status: Backport + +Signed-off-by: Lukasz Langa +--- + Lib/weakref.py | 4 ++-- + Misc/NEWS | 3 +++ + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/Lib/weakref.py b/Lib/weakref.py +index aaebd0c..787e33a 100644 +--- a/Lib/weakref.py ++++ b/Lib/weakref.py +@@ -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 = [] +diff --git a/Misc/NEWS b/Misc/NEWS +index 41cfdba..6d89f52 100644 +--- a/Misc/NEWS ++++ b/Misc/NEWS +@@ -5719,6 +5719,9 @@ Core and Builtins + Library + ------- + ++- Issue #29519: Fix weakref spewing exceptions during interpreter shutdown ++ when used with a rare combination of multiprocessing and custom codecs. ++ + - Issue #20154: Deadlock in asyncio.StreamReader.readexactly(). + + - Issue #16113: Remove sha3 module again. +-- +2.7.4 + diff --git a/meta/recipes-devtools/python/python3_3.5.3.bb b/meta/recipes-devtools/python/python3_3.5.3.bb index d7c29f2f7d..7419c71515 100644 --- a/meta/recipes-devtools/python/python3_3.5.3.bb +++ b/meta/recipes-devtools/python/python3_3.5.3.bb @@ -37,6 +37,7 @@ SRC_URI += "\ file://configure.ac-fix-LIBPL.patch \ file://upstream-random-fixes.patch \ file://0001-Issue-21272-Use-_sysconfigdata.py-to-initialize-dist.patch \ + file://Fix-29519-weakref-spewing-exceptions-during-interp-f.patch \ " SRC_URI[md5sum] = "57d1f8bfbabf4f2500273fb0706e6f21" SRC_URI[sha256sum] = "eefe2ad6575855423ab630f5b51a8ef6e5556f774584c06beab4926f930ddbb0" -- cgit v1.2.3-54-g00ecf