[Numpy-svn] r3119 - trunk/numpy/core/src

[numpy-svn at scipy.org]

Author: oliphant
Date: 2006-09-05 01:58:18 -0500 (Tue, 05 Sep 2006)
New Revision: 3119

Modified:
   trunk/numpy/core/src/arrayobject.c
Log:
Fixes for Python2.5

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-09-05 03:50:20 UTC (rev 3118)
+++ trunk/numpy/core/src/arrayobject.c	2006-09-05 06:58:18 UTC (rev 3119)
@@ -561,8 +561,8 @@
                 return ret;
         }
 #if (PY_VERSION_HEX >= 0x02050000)
-	if (PyIndex_Check(op)) {
-		long_value = (longlong) PyNumber_Index(op);
+	if (PyIndex_Check(o)) {
+		long_value = (longlong) PyNumber_Index(o);
 		goto finish;
 	}
 #endif
@@ -2691,7 +2691,7 @@
         }
 
         if (PyInt_Check(op) || PyArray_IsScalar(op, Integer) ||
-            PyLong_Check(op) || PyIndex_Check(index)) {
+            PyLong_Check(op) || PyIndex_Check(op)) {
                 intp value;
                 value = PyArray_PyIntAsIntp(op);
                 if (!PyErr_Occurred()) {