[Numpy-svn] r3414 - trunk/numpy/core

numpy-svn at scipy.org numpy-svn at scipy.org
Sat Oct 28 13:46:28 CDT 2006


Author: oliphant
Date: 2006-10-28 13:46:24 -0500 (Sat, 28 Oct 2006)
New Revision: 3414

Modified:
   trunk/numpy/core/numeric.py
Log:
Fix usage of 'as' as a variable

Modified: trunk/numpy/core/numeric.py
===================================================================
--- trunk/numpy/core/numeric.py	2006-10-28 09:27:49 UTC (rev 3413)
+++ trunk/numpy/core/numeric.py	2006-10-28 18:46:24 UTC (rev 3414)
@@ -290,7 +290,7 @@
         nb = 1
 
     a, b = asarray(a), asarray(b)
-    as = a.shape
+    as_ = a.shape
     nda = len(a.shape)
     bs = b.shape
     ndb = len(b.shape)
@@ -298,7 +298,7 @@
     if (na != nb): equal = 0
     else:
         for k in xrange(na):
-            if as[axes_a[k]] != bs[axes_b[k]]:
+            if as_[axes_a[k]] != bs[axes_b[k]]:
                 equal = 0
                 break
             if axes_a[k] < 0:
@@ -314,9 +314,9 @@
     newaxes_a = notin + axes_a
     N2 = 1
     for axis in axes_a:
-        N2 *= as[axis]
+        N2 *= as_[axis]
     newshape_a = (-1, N2)
-    olda = [as[axis] for axis in notin]
+    olda = [as_[axis] for axis in notin]
 
     notin = [k for k in range(ndb) if k not in axes_b]
     newaxes_b = axes_b + notin



More information about the Numpy-svn mailing list