diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2010-05-24 15:47:24 +0000 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2010-05-24 15:47:24 +0000 |
| commit | a7a01f351130afa9aee9bd6cf38934dc4c37cbb8 (patch) | |
| tree | 2e55399353e1e6bf0a71ac7e59872cfb2213cc3b /numpy/numarray | |
| parent | 88e683bc3fa9497259cba637a23d60dc31f07bc6 (diff) | |
| download | numpy-a7a01f351130afa9aee9bd6cf38934dc4c37cbb8.tar.gz | |
BUG: Fix problem with numarray _capi.c and python 2.7.
Diffstat (limited to 'numpy/numarray')
| -rw-r--r-- | numpy/numarray/_capi.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/numpy/numarray/_capi.c b/numpy/numarray/_capi.c index 534057095..1387404b7 100644 --- a/numpy/numarray/_capi.c +++ b/numpy/numarray/_capi.c @@ -3402,14 +3402,18 @@ 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 >= 0x02070000 +#if PY_VERSION_HEX >= 0x03010000 m = PyModule_Create(&moduledef); +#else + m = Py_InitModule("_capi", _libnumarrayMethods); +#endif + +#if PY_VERSION_HEX >= 0x02070000 c_api_object = PyCapsule_New((void *)libnumarray_API, NULL, NULL); if (c_api_object == NULL) { PyErr_Clear(); } #else - m = Py_InitModule("_capi", _libnumarrayMethods); c_api_object = PyCObject_FromVoidPtr((void *)libnumarray_API, NULL); #endif |