Author: Matti Picus <matti.pi...@gmail.com>
Branch:
Changeset: r62564:fe2fef48ab4e
Date: 2013-03-20 13:15 -0700
http://bitbucket.org/pypy/pypy/changeset/fe2fef48ab4e/
Log: merge heads
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
@@ -106,19 +106,16 @@
for w_k, w_v in list_pairs_w:
w_self.setitem(w_k, w_v)
- def setitem(self, w_key, w_value):
- self.strategy.setitem(self, w_key, w_value)
-
def setitem_str(self, key, w_value):
self.strategy.setitem_str(self, key, w_value)
def _add_indirections():
- dict_methods = "getitem \
- getitem_str delitem length \
- clear w_keys values \
- items iterkeys itervalues iteritems setdefault \
- popitem listview_str listview_unicode listview_int \
+ dict_methods = "getitem getitem_str setitem setdefault \
+ popitem delitem clear \
+ length w_keys values items \
+ iterkeys itervalues iteritems \
+ listview_str listview_unicode listview_int \
view_as_kwargs".split()
def make_method(method):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
