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/numarray | |
| 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/numarray')
| -rw-r--r-- | numpy/numarray/_capi.c | 2 | ||||
| -rw-r--r-- | numpy/numarray/include/numpy/libnumarray.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/numpy/numarray/_capi.c b/numpy/numarray/_capi.c index 875e383ea..534057095 100644 --- a/numpy/numarray/_capi.c +++ b/numpy/numarray/_capi.c @@ -3402,7 +3402,7 @@ PyMODINIT_FUNC init_capi(void) _Error = PyErr_NewException("numpy.numarray._capi.error", NULL, NULL); /* Create a CObject containing the API pointer array's address */ -#if PY_VERSION_HEX >= 0x03010000 +#if PY_VERSION_HEX >= 0x02070000 m = PyModule_Create(&moduledef); c_api_object = PyCapsule_New((void *)libnumarray_API, NULL, NULL); if (c_api_object == NULL) { diff --git a/numpy/numarray/include/numpy/libnumarray.h b/numpy/numarray/include/numpy/libnumarray.h index 738b5f1cc..08fe159f7 100644 --- a/numpy/numarray/include/numpy/libnumarray.h +++ b/numpy/numarray/include/numpy/libnumarray.h @@ -40,7 +40,7 @@ static void **libnumarray_API; #endif #endif -#if PY_VERSION_HEX >= 0x03010000 +#if PY_VERSION_HEX >= 0x02070000 #define _import_libnumarray() \ { \ PyObject *module = PyImport_ImportModule("numpy.numarray._capi"); \ |