Author: Wim Lavrijsen <wlavrij...@lbl.gov> Branch: reflex-support Changeset: r54168:374968f4e0af Date: 2012-04-02 16:41 -0700 http://bitbucket.org/pypy/pypy/changeset/374968f4e0af/
Log: merge default into branch; translation now works again diff --git a/pypy/objspace/std/dictproxyobject.py b/pypy/objspace/std/dictproxyobject.py --- a/pypy/objspace/std/dictproxyobject.py +++ b/pypy/objspace/std/dictproxyobject.py @@ -108,7 +108,8 @@ class DictProxyIteratorImplementation(IteratorImplementation): def __init__(self, space, strategy, dictimplementation): - IteratorImplementation.__init__(self, space, dictimplementation) + IteratorImplementation.__init__( + self, space, strategy, dictimplementation) w_type = strategy.unerase(dictimplementation.dstorage) self.iterator = w_type.dict_w.iteritems() diff --git a/pypy/objspace/std/mapdict.py b/pypy/objspace/std/mapdict.py --- a/pypy/objspace/std/mapdict.py +++ b/pypy/objspace/std/mapdict.py @@ -703,7 +703,8 @@ class MapDictIteratorImplementation(IteratorImplementation): def __init__(self, space, strategy, dictimplementation): - IteratorImplementation.__init__(self, space, dictimplementation) + IteratorImplementation.__init__( + self, space, strategy, dictimplementation) w_obj = strategy.unerase(dictimplementation.dstorage) self.w_obj = w_obj self.orig_map = self.curr_map = w_obj._get_mapdict_map() _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit