diff options
| author | Pauli Virtanen <pav@iki.fi> | 2010-07-17 15:15:15 +0000 |
|---|---|---|
| committer | Pauli Virtanen <pav@iki.fi> | 2010-07-17 15:15:15 +0000 |
| commit | 6f20d1e7650fbb3ad61855ca5d85dff0aafe2f72 (patch) | |
| tree | 4b7381747f6219f982a92e706ad39f74d5fa3773 /numpy/numarray | |
| parent | affa70a89ef0f23b1fd98a68c29ab6f5796746fb (diff) | |
| download | numpy-6f20d1e7650fbb3ad61855ca5d85dff0aafe2f72.tar.gz | |
BUG: core: use PyCapsule objects only on Python >= 3.0, stay with PyCObjects on Python 2.x
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 1387404b7..56e291055 100644 --- a/numpy/numarray/_capi.c +++ b/numpy/numarray/_capi.c @@ -3408,7 +3408,7 @@ PyMODINIT_FUNC init_capi(void) m = Py_InitModule("_capi", _libnumarrayMethods); #endif -#if PY_VERSION_HEX >= 0x02070000 +#if PY_VERSION_HEX >= 0x03000000 c_api_object = PyCapsule_New((void *)libnumarray_API, NULL, NULL); if (c_api_object == NULL) { PyErr_Clear(); diff --git a/numpy/numarray/include/numpy/libnumarray.h b/numpy/numarray/include/numpy/libnumarray.h index 08fe159f7..c69f10d8e 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 >= 0x02070000 +#if PY_VERSION_HEX >= 0x03000000 #define _import_libnumarray() \ { \ PyObject *module = PyImport_ImportModule("numpy.numarray._capi"); \ |