[Numpy-svn] r8431 - trunk/numpy/numarray

[numpy-svn at scipy.org]

Author: charris
Date: 2010-05-24 10:47:24 -0500 (Mon, 24 May 2010)
New Revision: 8431

Modified:
   trunk/numpy/numarray/_capi.c
Log:
BUG: Fix problem with numarray _capi.c and python 2.7.

Modified: trunk/numpy/numarray/_capi.c
===================================================================
--- trunk/numpy/numarray/_capi.c	2010-05-23 22:02:16 UTC (rev 8430)
+++ trunk/numpy/numarray/_capi.c	2010-05-24 15:47:24 UTC (rev 8431)
@@ -3402,14 +3402,18 @@
     _Error = PyErr_NewException("numpy.numarray._capi.error", NULL, NULL);
 
     /* Create a CObject containing the API pointer array's address */
+#if PY_VERSION_HEX >= 0x03010000
+    m = PyModule_Create(&moduledef);
+#else
+    m = Py_InitModule("_capi", _libnumarrayMethods);
+#endif
+
 #if PY_VERSION_HEX >= 0x02070000
-    m = PyModule_Create(&moduledef);
     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