diff options
| author |   Ronan Lamy <ronan.lamy@gmail.com> | 2017-09-29 00:18:50 +0200 |
|---|---|---|
| committer | Ronan Lamy <ronan.lamy@gmail.com> | 2017-09-29 00:18:50 +0200 |
| commit | 147749ec62ca3146c561d0f3a51ce9f5d79357cc (patch) | |
| tree | 80260293f751f89ee3892286225fe83001567b7f | |
| parent | hg merge default (diff) | |
| download | pypy-147749ec62ca3146c561d0f3a51ce9f5d79357cc.tar.gz pypy-147749ec62ca3146c561d0f3a51ce9f5d79357cc.tar.bz2 pypy-147749ec62ca3146c561d0f3a51ce9f5d79357cc.zip | |
fix merge
| -rw-r--r-- | pypy/module/cpyext/api.py | 4 | ||||
| -rw-r--r-- | pypy/module/cpyext/typeobject.py | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/pypy/module/cpyext/api.py b/pypy/module/cpyext/api.py index d070f04a8c..2bbd5c1db9 100644 --- a/pypy/module/cpyext/api.py +++ b/pypy/module/cpyext/api.py @@ -1340,13 +1340,13 @@ def generate_decls_and_callbacks(db, prefix=''): decls[pypy_decl].append(""" /* hack for https://bugs.python.org/issue29943 */ -PyAPI_FUNC(int) %s(PySliceObject *arg0, +PyAPI_FUNC(int) %s(PyObject *arg0, Signed arg1, Signed *arg2, Signed *arg3, Signed *arg4, Signed *arg5); #ifdef __GNUC__ __attribute__((__unused__)) #endif -static int PySlice_GetIndicesEx(PySliceObject *arg0, Py_ssize_t arg1, +static int PySlice_GetIndicesEx(PyObject *arg0, Py_ssize_t arg1, Py_ssize_t *arg2, Py_ssize_t *arg3, Py_ssize_t *arg4, Py_ssize_t *arg5) { return %s(arg0, arg1, arg2, arg3, diff --git a/pypy/module/cpyext/typeobject.py b/pypy/module/cpyext/typeobject.py index 2e76fb5c98..795a2aad7e 100644 --- a/pypy/module/cpyext/typeobject.py +++ b/pypy/module/cpyext/typeobject.py @@ -12,15 +12,14 @@ from pypy.module.cpyext import structmemberdefs from pypy.module.cpyext.api import ( cpython_api, cpython_struct, bootstrap_function, Py_ssize_t, slot_function, generic_cpy_call, METH_VARARGS, METH_KEYWORDS, CANNOT_FAIL, - build_type_checkers_flags, cts, parse_dir, PyObjectFields, PyTypeObject, + build_type_checkers_flags, cts, parse_dir, PyTypeObject, PyTypeObjectPtr, Py_buffer, Py_TPFLAGS_HEAPTYPE, Py_TPFLAGS_READY, Py_TPFLAGS_READYING, Py_TPFLAGS_LONG_SUBCLASS, Py_TPFLAGS_LIST_SUBCLASS, Py_TPFLAGS_TUPLE_SUBCLASS, Py_TPFLAGS_UNICODE_SUBCLASS, Py_TPFLAGS_DICT_SUBCLASS, Py_TPFLAGS_BASE_EXC_SUBCLASS, Py_TPFLAGS_TYPE_SUBCLASS, - Py_TPFLAGS_INT_SUBCLASS, Py_TPFLAGS_STRING_SUBCLASS, # change on py3 - ) + Py_TPFLAGS_BYTES_SUBCLASS) from pypy.module.cpyext.cparser import CTypeSpace from pypy.module.cpyext.methodobject import (W_PyCClassMethodObject, W_PyCWrapperObject, PyCFunction_NewEx, PyCFunction, PyMethodDef, @@ -40,7 +39,6 @@ from pypy.module.cpyext.typeobjectdefs import ( from pypy.objspace.std.typeobject import W_TypeObject, find_best_base -cts.parse_header(parse_dir / "cpyext_descrobject.h") #WARN_ABOUT_MISSING_SLOT_FUNCTIONS = False @@ -48,6 +46,7 @@ PyType_Check, PyType_CheckExact = build_type_checkers_flags("Type") PyHeapTypeObject = cts.gettype('PyHeapTypeObject *') +cts.parse_header(parse_dir / "cpyext_descrobject.h") cts.parse_header(parse_dir / "typeslots.h") |