Author: Armin Rigo <[email protected]>
Branch:
Changeset: r54153:ae4a7ab99a76
Date: 2012-04-02 17:32 +0200
http://bitbucket.org/pypy/pypy/changeset/ae4a7ab99a76/
Log: Fix for issue1100.
diff --git a/pypy/objspace/std/dictmultiobject.py
b/pypy/objspace/std/dictmultiobject.py
--- a/pypy/objspace/std/dictmultiobject.py
+++ b/pypy/objspace/std/dictmultiobject.py
@@ -247,7 +247,7 @@
return 0
def iter(self, w_dict):
- return EmptyIteratorImplementation(self.space, w_dict)
+ return EmptyIteratorImplementation(self.space, self, w_dict)
def clear(self, w_dict):
return
@@ -263,8 +263,9 @@
# Iterator Implementation base classes
class IteratorImplementation(object):
- def __init__(self, space, implementation):
+ def __init__(self, space, strategy, implementation):
self.space = space
+ self.strategy = strategy
self.dictimplementation = implementation
self.len = implementation.length()
self.pos = 0
@@ -272,7 +273,8 @@
def next(self):
if self.dictimplementation is None:
return None, None
- if self.len != self.dictimplementation.length():
+ if (self.len != self.dictimplementation.length()
+ or self.strategy is not self.dictimplementation.strategy):
self.len = -1 # Make this error state sticky
raise OperationError(self.space.w_RuntimeError,
self.space.wrap("dictionary changed size during
iteration"))
@@ -489,7 +491,7 @@
_mixin_ = True
def __init__(self, space, strategy, dictimplementation):
- IteratorImplementation.__init__(self, space, dictimplementation)
+ IteratorImplementation.__init__(self, space, strategy,
dictimplementation)
self.iterator =
strategy.unerase(dictimplementation.dstorage).iteritems()
def next_entry(self):
@@ -503,7 +505,7 @@
_mixin_ = True
def __init__(self, space, strategy, dictimplementation):
- IteratorImplementation.__init__(self, space, dictimplementation)
+ IteratorImplementation.__init__(self, space, strategy,
dictimplementation)
self.iterator =
strategy.unerase(dictimplementation.dstorage).iteritems()
def next_entry(self):
diff --git a/pypy/objspace/std/test/test_dictmultiobject.py
b/pypy/objspace/std/test/test_dictmultiobject.py
--- a/pypy/objspace/std/test/test_dictmultiobject.py
+++ b/pypy/objspace/std/test/test_dictmultiobject.py
@@ -804,6 +804,21 @@
assert "IntDictStrategy" in self.get_strategy(d)
assert d[1L] == "hi"
+ def test_iter_dict_length_change(self):
+ d = {1: 2, 3: 4, 5: 6}
+ it = d.iteritems()
+ d[7] = 8
+ # 'd' is now length 4
+ raises(RuntimeError, it.next)
+
+ def test_iter_dict_strategy_only_change(self):
+ d = {1: 2, 3: 4, 5: 6}
+ it = d.iteritems()
+ d['foo'] = 'bar'
+ del d[1]
+ # 'd' is still length 3, but its strategy changed
+ raises(RuntimeError, it.next)
+
class FakeString(str):
hash_count = 0
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
