Commit 4a1da9bf authored by Lisandro Dalcin's avatar Lisandro Dalcin

Remove conditional compilation handling old Python 3.0

parent 6b3811ff
...@@ -10,7 +10,7 @@ __pyx_capsule_create(void *p, CYTHON_UNUSED const char *sig) ...@@ -10,7 +10,7 @@ __pyx_capsule_create(void *p, CYTHON_UNUSED const char *sig)
{ {
PyObject *cobj; PyObject *cobj;
#if PY_VERSION_HEX >= 0x02070000 && !(PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION == 0) #if PY_VERSION_HEX >= 0x02070000
cobj = PyCapsule_New(p, sig, NULL); cobj = PyCapsule_New(p, sig, NULL);
#else #else
cobj = PyCObject_FromVoidPtr(p, NULL); cobj = PyCObject_FromVoidPtr(p, NULL);
......
...@@ -321,7 +321,7 @@ static int __Pyx_ImportFunction(PyObject *module, const char *funcname, void (** ...@@ -321,7 +321,7 @@ static int __Pyx_ImportFunction(PyObject *module, const char *funcname, void (**
PyModule_GetName(module), funcname); PyModule_GetName(module), funcname);
goto bad; goto bad;
} }
#if PY_VERSION_HEX >= 0x02070000 && !(PY_MAJOR_VERSION==3 && PY_MINOR_VERSION==0) #if PY_VERSION_HEX >= 0x02070000
if (!PyCapsule_IsValid(cobj, sig)) { if (!PyCapsule_IsValid(cobj, sig)) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"C function %.200s.%.200s has wrong signature (expected %.500s, got %.500s)", "C function %.200s.%.200s has wrong signature (expected %.500s, got %.500s)",
...@@ -381,7 +381,7 @@ static int __Pyx_ExportFunction(const char *name, void (*f)(void), const char *s ...@@ -381,7 +381,7 @@ static int __Pyx_ExportFunction(const char *name, void (*f)(void), const char *s
goto bad; goto bad;
} }
tmp.fp = f; tmp.fp = f;
#if PY_VERSION_HEX >= 0x02070000 && !(PY_MAJOR_VERSION==3&&PY_MINOR_VERSION==0) #if PY_VERSION_HEX >= 0x02070000
cobj = PyCapsule_New(tmp.p, sig, 0); cobj = PyCapsule_New(tmp.p, sig, 0);
#else #else
cobj = PyCObject_FromVoidPtrAndDesc(tmp.p, (void *)sig, 0); cobj = PyCObject_FromVoidPtrAndDesc(tmp.p, (void *)sig, 0);
...@@ -422,7 +422,7 @@ static int __Pyx_ImportVoidPtr(PyObject *module, const char *name, void **p, con ...@@ -422,7 +422,7 @@ static int __Pyx_ImportVoidPtr(PyObject *module, const char *name, void **p, con
PyModule_GetName(module), name); PyModule_GetName(module), name);
goto bad; goto bad;
} }
#if PY_VERSION_HEX >= 0x02070000 && !(PY_MAJOR_VERSION==3 && PY_MINOR_VERSION==0) #if PY_VERSION_HEX >= 0x02070000
if (!PyCapsule_IsValid(cobj, sig)) { if (!PyCapsule_IsValid(cobj, sig)) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"C variable %.200s.%.200s has wrong signature (expected %.500s, got %.500s)", "C variable %.200s.%.200s has wrong signature (expected %.500s, got %.500s)",
...@@ -476,7 +476,7 @@ static int __Pyx_ExportVoidPtr(PyObject *name, void *p, const char *sig) { ...@@ -476,7 +476,7 @@ static int __Pyx_ExportVoidPtr(PyObject *name, void *p, const char *sig) {
if (__Pyx_PyObject_SetAttrStr($module_cname, PYIDENT("$api_name"), d) < 0) if (__Pyx_PyObject_SetAttrStr($module_cname, PYIDENT("$api_name"), d) < 0)
goto bad; goto bad;
} }
#if PY_VERSION_HEX >= 0x02070000 && !(PY_MAJOR_VERSION==3 && PY_MINOR_VERSION==0) #if PY_VERSION_HEX >= 0x02070000
cobj = PyCapsule_New(p, sig, 0); cobj = PyCapsule_New(p, sig, 0);
#else #else
cobj = PyCObject_FromVoidPtrAndDesc(p, (void *)sig, 0); cobj = PyCObject_FromVoidPtrAndDesc(p, (void *)sig, 0);
...@@ -502,7 +502,7 @@ static int __Pyx_SetVtable(PyObject *dict, void *vtable); /*proto*/ ...@@ -502,7 +502,7 @@ static int __Pyx_SetVtable(PyObject *dict, void *vtable); /*proto*/
/////////////// SetVTable /////////////// /////////////// SetVTable ///////////////
static int __Pyx_SetVtable(PyObject *dict, void *vtable) { static int __Pyx_SetVtable(PyObject *dict, void *vtable) {
#if PY_VERSION_HEX >= 0x02070000 && !(PY_MAJOR_VERSION==3&&PY_MINOR_VERSION==0) #if PY_VERSION_HEX >= 0x02070000
PyObject *ob = PyCapsule_New(vtable, 0, 0); PyObject *ob = PyCapsule_New(vtable, 0, 0);
#else #else
PyObject *ob = PyCObject_FromVoidPtr(vtable, 0); PyObject *ob = PyCObject_FromVoidPtr(vtable, 0);
...@@ -530,7 +530,7 @@ static void* __Pyx_GetVtable(PyObject *dict) { ...@@ -530,7 +530,7 @@ static void* __Pyx_GetVtable(PyObject *dict) {
PyObject *ob = PyObject_GetItem(dict, PYIDENT("__pyx_vtable__")); PyObject *ob = PyObject_GetItem(dict, PYIDENT("__pyx_vtable__"));
if (!ob) if (!ob)
goto bad; goto bad;
#if PY_VERSION_HEX >= 0x02070000 && !(PY_MAJOR_VERSION==3&&PY_MINOR_VERSION==0) #if PY_VERSION_HEX >= 0x02070000
ptr = PyCapsule_GetPointer(ob, 0); ptr = PyCapsule_GetPointer(ob, 0);
#else #else
ptr = PyCObject_AsVoidPtr(ob); ptr = PyCObject_AsVoidPtr(ob);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment