Author: Philip Jenvey <[email protected]> Branch: py3k Changeset: r74146:7b463df83cc8 Date: 2014-10-23 17:01 -0700 http://bitbucket.org/pypy/pypy/changeset/7b463df83cc8/
Log: fix diff --git a/pypy/module/marshal/interp_marshal.py b/pypy/module/marshal/interp_marshal.py --- a/pypy/module/marshal/interp_marshal.py +++ b/pypy/module/marshal/interp_marshal.py @@ -2,7 +2,7 @@ from pypy.interpreter.gateway import WrappedDefault, unwrap_spec from rpython.rlib.rarithmetic import intmask from rpython.rlib import rstackovf -from pypy.objspace.std.marshal_impl import get_unmarshallers +from pypy.objspace.std.marshal_impl import marshal, get_unmarshallers Py_MARSHAL_VERSION = 2 _______________________________________________ pypy-commit mailing list [email protected] https://mail.python.org/mailman/listinfo/pypy-commit
