Fix issues with DictStack length and item access on PyPy.

jaraco · Jan 5, 2022 · 9d39238 · 9d39238
1 parent 13965b7
commit 9d39238
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,9 @@
+v3.5.1
+======
+
+Fixed ``DictStack.__len__`` and addressed recursion error on
+PyPy in ``__getitem__``.
+
 v3.5.0
 ======
 

diff --git a/jaraco/collections.py b/jaraco/collections.py
@@ -573,6 +573,8 @@ class DictStack(list, collections.abc.Mapping):
     2
     >>> stack['c']
     2
+    >>> len(stack)
+    3
     >>> stack.push(dict(a=3))
     >>> stack['a']
     3
@@ -598,7 +600,7 @@ def __iter__(self):
         return iter(set(itertools.chain.from_iterable(c.keys() for c in dicts)))
 
     def __getitem__(self, key):
-        for scope in reversed(self):
+        for scope in reversed(tuple(list.__iter__(self))):
             if key in scope:
                 return scope[key]
         raise KeyError(key)
@@ -608,6 +610,9 @@ def __getitem__(self, key):
     def __contains__(self, other):
         return collections.abc.Mapping.__contains__(self, other)
 
+    def __len__(self):
+        return len(list(iter(self)))
+
 
 class BijectiveMap(dict):
     """