Author: Ronan Lamy <ronan.l...@gmail.com>
Branch: py3k
Changeset: r82037:fbbd055f16fa
Date: 2016-02-01 17:03 +0000
http://bitbucket.org/pypy/pypy/changeset/fbbd055f16fa/
Log: fix merge
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
@@ -130,8 +130,8 @@
if ulist is not None:
strategy = space.fromcache(UnicodeDictStrategy)
storage = strategy.get_storage_fromkeys(ulist, w_fill)
- w_dict = space.allocate_instance(W_DictMultiObject, w_type)
- W_DictMultiObject.__init__(w_dict, space, strategy, storage)
+ w_dict = space.allocate_instance(W_DictObject, w_type)
+ W_DictObject.__init__(w_dict, space, strategy, storage)
else:
w_dict = W_DictMultiObject.allocate_and_init_instance(space,
w_type)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
