[pypy-commit] pypy cpyext-gc-support-2: fix

arigo pypy.commits at gmail.com
Wed Jan 27 13:15:13 EST 2016


Author: Armin Rigo <arigo at tunes.org>
Branch: cpyext-gc-support-2
Changeset: r81980:4f7fc4ae3711
Date: 2016-01-27 19:14 +0100
http://bitbucket.org/pypy/pypy/changeset/4f7fc4ae3711/

Log:	fix

diff --git a/pypy/module/cpyext/api.py b/pypy/module/cpyext/api.py
--- a/pypy/module/cpyext/api.py
+++ b/pypy/module/cpyext/api.py
@@ -291,7 +291,7 @@
             @specialize.ll()
             def unwrapper(space, *args):
                 from pypy.module.cpyext.pyobject import Py_DecRef, is_pyobj
-                from pypy.module.cpyext.pyobject import make_ref, from_ref
+                from pypy.module.cpyext.pyobject import from_ref, as_pyobj
                 newargs = ()
                 keepalives = ()
                 assert len(args) == len(api_function.argtypes)
@@ -301,7 +301,7 @@
                         # build a 'PyObject *' (not holding a reference)
                         if not is_pyobj(input_arg):
                             keepalives += (input_arg,)
-                            arg = rffi.cast(ARG, as_xpyobj(space, input_arg))
+                            arg = rffi.cast(ARG, as_pyobj(space, input_arg))
                         else:
                             arg = rffi.cast(ARG, input_arg)
                     elif is_PyObject(ARG) and is_wrapped:


More information about the pypy-commit mailing list