Author: Manuel Jacob
Branch: remove-dict-smm
Changeset: r64251:ebe7cb75112a
Date: 2013-05-17 11:56 +0200
http://bitbucket.org/pypy/pypy/changeset/ebe7cb75112a/
Log: Fix translation.
diff --git a/pypy/objspace/std/marshal_impl.py
b/pypy/objspace/std/marshal_impl.py
--- a/pypy/objspace/std/marshal_impl.py
+++ b/pypy/objspace/std/marshal_impl.py
@@ -12,6 +12,7 @@
from pypy.objspace.std.register_all import register_all
from rpython.rlib.rarithmetic import LONG_BIT, r_longlong, r_uint, intmask
from pypy.objspace.std import model
+from pypy.objspace.std.dictmultiobject import W_DictMultiObject
from pypy.interpreter.special import Ellipsis
from pypy.interpreter.pycode import PyCode
from pypy.interpreter import gateway, unicodehelper
@@ -309,6 +310,8 @@
register(TYPE_LIST, unmarshal_List)
def marshal_w_dict(space, w_dict, m):
+ if not isinstance(w_dict, W_DictMultiObject):
+ raise_exception(space, "unmarshallable object")
m.start(TYPE_DICT)
for w_tuple in w_dict.items():
w_key, w_value = space.fixedview(w_tuple, 2)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
