diff options
author | Raymond Hettinger <python@rcn.com> | 2016-12-31 19:01:59 (GMT) |
---|---|---|
committer | Raymond Hettinger <python@rcn.com> | 2016-12-31 19:01:59 (GMT) |
commit | b46ea9034349b9d713daff581e624afe07916629 (patch) | |
tree | 57d100415241ca7a3fcc7b76333471e613028844 | |
parent | 6b5e4a86a7f53bcdc565d1eb6d88c17d16b64a2f (diff) | |
download | cpython-b46ea9034349b9d713daff581e624afe07916629.zip cpython-b46ea9034349b9d713daff581e624afe07916629.tar.gz cpython-b46ea9034349b9d713daff581e624afe07916629.tar.bz2 |
Issue #29119: Fix weakref in OrderedDict.move_to_end(). Work by Andra Bogildea.
-rw-r--r-- | Lib/collections/__init__.py | 7 | ||||
-rw-r--r-- | Misc/ACKS | 1 | ||||
-rw-r--r-- | Misc/NEWS | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py index ebe8ee7..bea811d 100644 --- a/Lib/collections/__init__.py +++ b/Lib/collections/__init__.py @@ -189,6 +189,7 @@ class OrderedDict(dict): link = self.__map[key] link_prev = link.prev link_next = link.next + soft_link = link_next.prev link_prev.next = link_next link_next.prev = link_prev root = self.__root @@ -196,12 +197,14 @@ class OrderedDict(dict): last = root.prev link.prev = last link.next = root - last.next = root.prev = link + root.prev = soft_link + last.next = link else: first = root.next link.prev = root link.next = first - root.next = first.prev = link + first.prev = soft_link + root.next = link def __sizeof__(self): sizeof = _sys.getsizeof @@ -156,6 +156,7 @@ Finn Bock Paul Boddie Matthew Boedicker Robin Boerdijk +Andra Bogildea David Bolen Wouter Bolsterlee Gawain Bolton @@ -143,6 +143,10 @@ Library - Issue #13051: Fixed recursion errors in large or resized curses.textpad.Textbox. Based on patch by Tycho Andersen. +- Issue #29119: Fix weakrefs in the pure python version of + collections.OrderedDict move_to_end() method. + Contributed by Andra Bogildea. + - Issue #9770: curses.ascii predicates now work correctly with negative integers. |