[pypy-commit] pypy dict-strategies: no longer needed
cfbolz
noreply at buildbot.pypy.org
Fri Jul 1 21:01:28 CEST 2011
Author: Carl Friedrich Bolz <cfbolz at gmx.de>
Branch: dict-strategies
Changeset: r45242:cd3882d509f3
Date: 2011-07-01 21:08 +0200
http://bitbucket.org/pypy/pypy/changeset/cd3882d509f3/
Log: no longer needed
diff --git a/pypy/module/pypyjit/test_pypy_c/test_instance.py b/pypy/module/pypyjit/test_pypy_c/test_instance.py
--- a/pypy/module/pypyjit/test_pypy_c/test_instance.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_instance.py
@@ -115,7 +115,7 @@
# ----------------------
loop, = log.loops_by_filename(self.filepath)
assert loop.match("""
- i9 = int_lt(i8, i7)
+ i9 = int_lt(i7, i8)
guard_true(i9, descr=.*)
guard_not_invalidated(descr=.*)
i11 = int_add(i8, 1)
@@ -124,7 +124,7 @@
p20 = new_with_vtable(ConstClass(W_IntObject))
setfield_gc(p20, i11, descr=<SignedFieldDescr.*W_IntObject.inst_intval .*>)
setfield_gc(ConstPtr(ptr21), p20, descr=<GcPtrFieldDescr .*TypeCell.inst_w_value .*>)
- jump(p0, p1, p2, p3, p4, p20, p6, i11, i7, descr=<Loop.>)
+ jump(p0, p1, p2, p3, p4, p20, p6, i11, i8, descr=<Loop.>)
""")
def test_oldstyle_newstyle_mix(self):
diff --git a/pypy/objspace/std/celldict.py b/pypy/objspace/std/celldict.py
--- a/pypy/objspace/std/celldict.py
+++ b/pypy/objspace/std/celldict.py
@@ -148,18 +148,6 @@
w_dict.strategy = strategy
w_dict.dstorage = strategy.erase(d_new)
- def _as_rdict(self):
- r_dict_content = self.initialize_as_rdict()
- for k, cell in self.content.iteritems():
- if cell.w_value is not None:
- r_dict_content[self.space.wrap(k)] = cell.w_value
- cell.invalidate()
- self._clear_fields()
- return self
-
- def _clear_fields(self):
- self.content = None
-
class ModuleDictIteratorImplementation(IteratorImplementation):
def __init__(self, space, strategy, dictimplementation):
IteratorImplementation.__init__(self, space, dictimplementation)
More information about the pypy-commit
mailing list