Author: Richard Plangger <[email protected]>
Branch: py3.5
Changeset: r89435:fd5118ae627c
Date: 2017-01-09 14:30 +0100
http://bitbucket.org/pypy/pypy/changeset/fd5118ae627c/
Log: merge issure found
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
@@ -525,7 +525,7 @@
'PyCapsule_SetPointer', 'PyCapsule_SetName', 'PyCapsule_SetDestructor',
'PyCapsule_SetContext', 'PyCapsule_Import', 'PyCapsule_Type',
'_Py_get_capsule_type',
- 'PyComplex_AsCComplex', 'PyComplex_FromCComplex',
+ #'PyComplex_AsCComplex', 'PyComplex_FromCComplex',
'PyObject_AsReadBuffer', 'PyObject_AsWriteBuffer',
'PyObject_CheckReadBuffer',
@@ -1091,7 +1091,7 @@
ptr.value = ctypes.cast(ll2ctypes.lltype2ctypes(value),
ctypes.c_void_p).value
elif typ in ('PyObject*', 'PyTypeObject*'):
- if name.startswith('PyPyExc_') or
name.startswith('cpyexttestExc_'):
+ if name.startswith('PyExc_'):
# we already have the pointer
in_dll = ll2ctypes.get_ctypes_type(PyObject).in_dll(bridge,
mname)
py_obj = ll2ctypes.ctypes2lltype(PyObject, in_dll)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
