[Numpy-svn] r3093 - trunk/numpy/lib

numpy-svn at scipy.org numpy-svn at scipy.org
Tue Aug 29 04:37:49 CDT 2006


Author: oliphant
Date: 2006-08-29 04:37:47 -0500 (Tue, 29 Aug 2006)
New Revision: 3093

Modified:
   trunk/numpy/lib/arraysetops.py
   trunk/numpy/lib/shape_base.py
Log:
Restore un-needed axis arguments

Modified: trunk/numpy/lib/arraysetops.py
===================================================================
--- trunk/numpy/lib/arraysetops.py	2006-08-29 06:52:33 UTC (rev 3092)
+++ trunk/numpy/lib/arraysetops.py	2006-08-29 09:37:47 UTC (rev 3093)
@@ -66,7 +66,7 @@
     if retindx:
         ar = numpy.array(ar1).ravel()
         perm = ar.argsort()
-        aux = ar.take(perm,0)
+        aux = ar.take(perm)
         flag = ediff1d( aux, 1 ) != 0
         return perm.compress(flag), aux.compress(flag)
     else:
@@ -113,8 +113,8 @@
     tt = concat( (zlike( ar1 ),
                   zlike( ar2 ) + 1) )
     perm = ar.argsort()
-    aux = ar.take(perm,0)
-    aux2 = tt.take(perm,0)
+    aux = ar.take(perm)
+    aux2 = tt.take(perm)
     flag = ediff1d( aux, 1 ) == 0
 
     ii = numpy.where( flag * aux2 )[0]
@@ -124,7 +124,7 @@
 
     indx = perm.argsort()[:len( ar1 )]
 
-    return flag.take( indx , 0)
+    return flag.take( indx )
 
 ##
 # 03.11.2005, c

Modified: trunk/numpy/lib/shape_base.py
===================================================================
--- trunk/numpy/lib/shape_base.py	2006-08-29 06:52:33 UTC (rev 3092)
+++ trunk/numpy/lib/shape_base.py	2006-08-29 09:37:47 UTC (rev 3093)
@@ -25,7 +25,7 @@
     indlist = range(nd)
     indlist.remove(axis)
     i[axis] = slice(None,None)
-    outshape = asarray(arr.shape).take(indlist,0)
+    outshape = asarray(arr.shape).take(indlist)
     i.put(ind, indlist)
     res = func1d(arr[tuple(i.tolist())],*args)
     #  if res is a number, then we have a smaller output array



More information about the Numpy-svn mailing list