Forward port r70533 and r70538.

Lib/collections.py

@@ -11,74 +11,87 @@ from operator import itemgetter as _itemgetter
 from keyword import iskeyword as _iskeyword
 import sys as _sys
 import heapq as _heapq
+from weakref import proxy
 from itertools import repeat as _repeat, chain as _chain, starmap as _starmap
 
 ################################################################################
 ### OrderedDict
 ################################################################################
 
+class _Link(object):
+    __slots__ = 'prev', 'next', 'key', '__weakref__'
+
 class OrderedDict(dict, MutableMapping):
     'Dictionary that remembers insertion order'
-    # The inherited dict maps keys to values.
+    # An inherited dict maps keys to values.
-    # The internal self.__map dictionary maps keys to links in a doubly linked list.
-    # The doubly linked list starts and ends with a sentinel element.
-    # The sentinel element never gets deleted.  It simplifies the algorithm.
-    # Setting a new item causes a new link to append to the doubly linked list.
-    # Deleting an item uses self.__map to find the link, which is then removed.
-    # Iteration follows the linked list in order.
-    # Reverse iteration follows the links backwards.
     # The inherited dict provides __getitem__, __len__, __contains__, and get.
     # The remaining methods are order-aware.
-    # Big-Oh running times for all methods are the same as for regular dictionaries.
+    # Big-O running times for all methods are the same as for regular dictionaries.
+
+    # The internal self.__map dictionary maps keys to links in a doubly linked list.
+    # The circular doubly linked list starts and ends with a sentinel element.
+    # The sentinel element never gets deleted (this simplifies the algorithm).
+    # The prev/next links are weakref proxies (to prevent circular references).
+    # Individual links are kept alive by the hard reference in self.__map.
+    # Those hard references disappear when a key is deleted from an OrderedDict.
 
     def __init__(self, *args, **kwds):
         if len(args) > 1:
             raise TypeError('expected at most 1 arguments, got %d' % len(args))
         try:
-            self.__end
+            self.__root
         except AttributeError:
+            self.__root = _Link()       # sentinel node for the doubly linked list
             self.clear()
         self.update(*args, **kwds)
 
     def clear(self):
-        self.__end = end = []
+        root = self.__root
-        end += [None, end, end]         # sentinel node for doubly linked list
+        root.prev = root.next = root
-        self.__map = {}                 # key --> [key, prev, next]
+        self.__map = {}
         dict.clear(self)
 
     def __setitem__(self, key, value):
+        # Setting a new item creates a new link which goes at the end of the linked
+        # list, and the inherited dictionary is updated with the new key/value pair.
         if key not in self:
-            end = self.__end
+            self.__map[key] = link = _Link()
-            curr = end[1]
+            root = self.__root
-            curr[2] = end[1] = self.__map[key] = [key, curr, end]
+            last = root.prev
+            link.prev, link.next, link.key = last, root, key
+            last.next = root.prev = proxy(link)
         dict.__setitem__(self, key, value)
 
     def __delitem__(self, key):
+        # Deleting an existing item uses self.__map to find the link which is
+        # then removed by updating the links in the predecessor and successor nodes.
         dict.__delitem__(self, key)
-        key, prev, next = self.__map.pop(key)
+        link = self.__map.pop(key)
-        prev[2] = next
+        link.prev.next = link.next
-        next[1] = prev
+        link.next.prev = link.prev
 
     def __iter__(self):
-        end = self.__end
+        # Traverse the linked list in order.
-        curr = end[2]                   # start at first link
+        root = self.__root
-        while curr is not end:
+        curr = root.next
-            yield curr[0]               # yield KEY for each link
+        while curr is not root:
-            curr = curr[2]              # goto next link
+            yield curr.key
+            curr = curr.next
 
     def __reversed__(self):
-        end = self.__end
+        # Traverse the linked list in reverse order.
-        curr = end[1]                   # start at last link
+        root = self.__root
-        while curr is not end:
+        curr = root.prev
-            yield curr[0]               # yield KEY for each link
+        while curr is not root:
-            curr = curr[1]              # goto prev link
+            yield curr.key
+            curr = curr.prev
 
     def __reduce__(self):
         items = [[k, self[k]] for k in self]
-        tmp = self.__map, self.__end
+        tmp = self.__map, self.__root
-        del self.__map, self.__end
+        del self.__map, self.__root
         inst_dict = vars(self).copy()
-        self.__map, self.__end = tmp
+        self.__map, self.__root = tmp
         if inst_dict:
             return (self.__class__, (items,), inst_dict)
         return self.__class__, (items,)