diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2010-05-03 07:50:02 +0000 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2010-05-03 07:50:02 +0000 |
| commit | bc656ee7cb00a6c4ad0d43f1cdd36bf8c9a026ed (patch) | |
| tree | 43db63bf9d9ad272bb252705de933c8a9ad3940c /numpy/f2py | |
| parent | 82d8d97ac30e20f9ae605df228bee43d89ef72a2 (diff) | |
| download | numpy-bc656ee7cb00a6c4ad0d43f1cdd36bf8c9a026ed.tar.gz | |
ENH, BUG: PyCObject will be deprecated in python 2.7. So use the NpyCapsule
compatibility functions in npy_3kcompat.h to replace the current calls.
This gets rid of a number of version checks and is easier to maintain.
Fix bug that was present in the ufunc _loop1d_list_free destructor in
the python3k case.
Diffstat (limited to 'numpy/f2py')
| -rw-r--r-- | numpy/f2py/src/fortranobject.c | 8 | ||||
| -rw-r--r-- | numpy/f2py/src/fortranobject.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/numpy/f2py/src/fortranobject.c b/numpy/f2py/src/fortranobject.c index 1cd3d3f31..05ecd1383 100644 --- a/numpy/f2py/src/fortranobject.c +++ b/numpy/f2py/src/fortranobject.c @@ -913,11 +913,11 @@ int copy_ND_array(const PyArrayObject *arr, PyArrayObject *out) return PyArray_CopyInto(out, (PyArrayObject *)arr); } -/*******************************************/ -/* Compatibility functions for Python 3.1 */ -/*******************************************/ +/*********************************************/ +/* Compatibility functions for Python >= 2.7 */ +/*********************************************/ -#if PY_VERSION_HEX >= 0X03010000 +#if PY_VERSION_HEX >= 0X02070000 PyObject * F2PyCapsule_FromVoidPtr(void *ptr, void (*dtor)(PyObject *)) diff --git a/numpy/f2py/src/fortranobject.h b/numpy/f2py/src/fortranobject.h index 54a386514..e4ebc4664 100644 --- a/numpy/f2py/src/fortranobject.h +++ b/numpy/f2py/src/fortranobject.h @@ -76,7 +76,7 @@ extern "C" { 123456789-123456789-123456789-123456789-123456789-123456789-123456789-12 PyFortranObject represents various Fortran objects: -Fortran (module) routines, COMMON blocks, module data. +Fortran (module) routines, COMMON blocks, module data. Author: Pearu Peterson <pearu@cens.ioc.ee> */ @@ -121,7 +121,7 @@ typedef struct { extern PyObject * PyFortranObject_New(FortranDataDef* defs, f2py_void_func init); extern PyObject * PyFortranObject_NewAsAttr(FortranDataDef* defs); -#if PY_VERSION_HEX >= 0x03010000 +#if PY_VERSION_HEX >= 0x02070000 PyObject * F2PyCapsule_FromVoidPtr(void *ptr, void (*dtor)(PyObject *)); void * F2PyCapsule_AsVoidPtr(PyObject *obj); |