[pypy-commit] pypy missing-tp_new: cpython_api ... header=None => slot_function

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: missing-tp_new
Changeset: r89487:748bf3d6f4c5
Date: 2017-01-11 00:37 +0200
http://bitbucket.org/pypy/pypy/changeset/748bf3d6f4c5/

Log:	cpython_api ... header=None => slot_function

diff --git a/pypy/module/cpyext/slotdefs.py b/pypy/module/cpyext/slotdefs.py
--- a/pypy/module/cpyext/slotdefs.py
+++ b/pypy/module/cpyext/slotdefs.py
@@ -562,7 +562,7 @@
             slot_fn = w_type.getdictvalue(space, attr)
             if slot_fn is None:
                 return
-            @cpython_api([PyObject], lltype.Signed, header=header, error=-1)
+            @slot_function([PyObject], lltype.Signed, header=header, error=-1)
             @func_renamer("cpyext_%s_%s" % (name.replace('.', '_'), typedef.name))
             def slot_func(space, w_obj):
                 return space.int_w(space.call_function(slot_fn, w_obj))
diff --git a/pypy/module/cpyext/userslot.py b/pypy/module/cpyext/userslot.py
--- a/pypy/module/cpyext/userslot.py
+++ b/pypy/module/cpyext/userslot.py
@@ -12,23 +12,23 @@
 
 from pypy.interpreter.error import oefmt
 from pypy.interpreter.argument import Arguments
-from pypy.module.cpyext.api import cpython_api, PyObject, Py_ssize_t
+from pypy.module.cpyext.api import slot_function, PyObject, Py_ssize_t
 from pypy.module.cpyext.api import PyTypeObjectPtr
 from rpython.rtyper.lltypesystem import rffi, lltype
 
- at cpython_api([PyObject], Py_ssize_t, error=-1, header=None)
+ at slot_function([PyObject], Py_ssize_t, error=-1)
 def slot_sq_length(space, w_obj):
     return space.int_w(space.len(w_obj))
 
- at cpython_api([PyObject], lltype.Signed, header=None, error=-1)
+ at slot_function([PyObject], lltype.Signed, error=-1)
 def slot_tp_hash(space, w_obj):
     return space.int_w(space.hash(w_obj))
 
- at cpython_api([PyObject, Py_ssize_t], PyObject, header=None)
+ at slot_function([PyObject, Py_ssize_t], PyObject)
 def slot_sq_item(space, w_obj, index):
     return space.getitem(w_obj, space.wrap(index))
 
- at cpython_api([PyTypeObjectPtr, PyObject, PyObject], PyObject, header=None)
+ at slot_function([PyTypeObjectPtr, PyObject, PyObject], PyObject)
 def slot_tp_new(space, w_type, w_args, w_kwds):
     # XXX problem - we need to find the actual __new__ function to call.
     #     but we have no 'self' argument. Theoretically, self will be
@@ -51,61 +51,61 @@
 
 # unary functions
 
- at cpython_api([PyObject], PyObject, header=None)
+ at slot_function([PyObject], PyObject)
 def slot_tp_str(space, w_obj):
     return space.str(w_obj)
 
- at cpython_api([PyObject], PyObject, header=None)
+ at slot_function([PyObject], PyObject)
 def slot_tp_repr(space, w_obj):
     return space.repr(w_obj)
 
 #binary functions
 
- at cpython_api([PyObject, PyObject], PyObject, header=None)
+ at slot_function([PyObject, PyObject], PyObject)
 def slot_nb_add(space, w_obj1, w_obj2):
     return space.add(w_obj1, w_obj2)
 
- at cpython_api([PyObject, PyObject], PyObject, header=None)
+ at slot_function([PyObject, PyObject], PyObject)
 def slot_nb_subtract(space, w_obj1, w_obj2):
     return space.sub(w_obj1, w_obj2)
 
- at cpython_api([PyObject, PyObject], PyObject, header=None)
+ at slot_function([PyObject, PyObject], PyObject)
 def slot_nb_multiply(space, w_obj1, w_obj2):
     return space.mul(w_obj1, w_obj2)
 
- at cpython_api([PyObject, PyObject], PyObject, header=None)
+ at slot_function([PyObject, PyObject], PyObject)
 def slot_nb_divide(space, w_obj1, w_obj2):
     return space.div(w_obj1, w_obj2)
 
- at cpython_api([PyObject, PyObject], PyObject, header=None)
+ at slot_function([PyObject, PyObject], PyObject)
 def slot_nb_inplace_add(space, w_obj1, w_obj2):
     return space.add(w_obj1, w_obj2)
 
- at cpython_api([PyObject, PyObject], PyObject, header=None)
+ at slot_function([PyObject, PyObject], PyObject)
 def slot_nb_inplace_subtract(space, w_obj1, w_obj2):
     return space.sub(w_obj1, w_obj2)
 
- at cpython_api([PyObject, PyObject], PyObject, header=None)
+ at slot_function([PyObject, PyObject], PyObject)
 def slot_nb_inplace_multiply(space, w_obj1, w_obj2):
     return space.mul(w_obj1, w_obj2)
 
- at cpython_api([PyObject, PyObject], PyObject, header=None)
+ at slot_function([PyObject, PyObject], PyObject)
 def slot_nb_inplace_divide(space, w_obj1, w_obj2):
     return space.div(w_obj1, w_obj2)
 
- at cpython_api([PyObject, PyObject], PyObject, header=None)
+ at slot_function([PyObject, PyObject], PyObject)
 def slot_sq_concat(space, w_obj1, w_obj2):
     return space.add(w_obj1, w_obj2)
 
- at cpython_api([PyObject, PyObject], PyObject, header=None)
+ at slot_function([PyObject, PyObject], PyObject)
 def slot_sq_inplace_concat(space, w_obj1, w_obj2):
     return space.add(w_obj1, w_obj2)
 
- at cpython_api([PyObject, PyObject], PyObject, header=None)
+ at slot_function([PyObject, PyObject], PyObject)
 def slot_mp_subscript(space, w_obj1, w_obj2):
     return space.getitem(w_obj1, w_obj2)
 
- at cpython_api([PyObject, PyObject], PyObject, header=None)
+ at slot_function([PyObject, PyObject], PyObject)
 def slot_tp_getattr(space, w_obj1, w_obj2):
     return space.getattr(w_obj1, w_obj2)