Author: Maciej Fijalkowski <fij...@gmail.com>
Branch:
Changeset: r64050:bcf984fdbff0
Date: 2013-05-13 23:11 +0200
http://bitbucket.org/pypy/pypy/changeset/bcf984fdbff0/
Log: merge
diff --git a/pypy/module/__pypy__/interp_magic.py
b/pypy/module/__pypy__/interp_magic.py
--- a/pypy/module/__pypy__/interp_magic.py
+++ b/pypy/module/__pypy__/interp_magic.py
@@ -1,4 +1,3 @@
-from pypy.interpreter.baseobjspace import ObjSpace, W_Root
from pypy.interpreter.error import OperationError, wrap_oserror
from pypy.interpreter.gateway import unwrap_spec
from rpython.rlib.objectmodel import we_are_translated
@@ -56,7 +55,7 @@
bltn = BuiltinFunction(func)
return space.wrap(bltn)
-@unwrap_spec(ObjSpace, W_Root, str)
+@unwrap_spec(meth=str)
def lookup_special(space, w_obj, meth):
"""Lookup up a special method on an object."""
if space.is_oldstyle_instance(w_obj):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
