# [Numpy-svn] r3088 - in trunk/numpy: core lib

numpy-svn at scipy.org numpy-svn at scipy.org
Mon Aug 28 15:01:38 CDT 2006

Author: oliphant
Date: 2006-08-28 15:01:34 -0500 (Mon, 28 Aug 2006)
New Revision: 3088

Modified:
trunk/numpy/core/fromnumeric.py
trunk/numpy/core/numeric.py
trunk/numpy/lib/function_base.py
Log:
Fix sundry errors.

Modified: trunk/numpy/core/fromnumeric.py
===================================================================
--- trunk/numpy/core/fromnumeric.py	2006-08-28 19:52:55 UTC (rev 3087)
+++ trunk/numpy/core/fromnumeric.py	2006-08-28 20:01:34 UTC (rev 3088)
@@ -356,6 +356,7 @@
if out is not None:
out[...] = res
return out
+        return res
try:
sum = x.sum
except AttributeError:

Modified: trunk/numpy/core/numeric.py
===================================================================
--- trunk/numpy/core/numeric.py	2006-08-28 19:52:55 UTC (rev 3087)
+++ trunk/numpy/core/numeric.py	2006-08-28 20:01:34 UTC (rev 3088)
@@ -252,7 +252,7 @@
def restoredot():
pass

-def tensordot(a, b, axes=(-1,0))
+def tensordot(a, b, axes=(-1,0)):
"""tensordot returns the product for any (ndim >= 1) arrays.

r_{xxx, yyy} = \sum_k a_{xxx,k} b_{k,yyy} where
@@ -286,7 +286,7 @@
if not equal:
raise ValueError, "shape-mismatch for sum"

-    olda = [ for k in aa if k not in axes_a]
+    olda = [k for k in aa if k not in axes_a]
oldb = [k for k in bs if k not in axes_b]

at = a.reshape(nd1, nd2)

Modified: trunk/numpy/lib/function_base.py
===================================================================
--- trunk/numpy/lib/function_base.py	2006-08-28 19:52:55 UTC (rev 3087)
+++ trunk/numpy/lib/function_base.py	2006-08-28 20:01:34 UTC (rev 3088)
@@ -1,4 +1,4 @@
-u__all__ = ['logspace', 'linspace',
+__all__ = ['logspace', 'linspace',
'select', 'piecewise', 'trim_zeros',
'copy', 'iterable', #'base_repr', 'binary_repr',
'diff', 'gradient', 'angle', 'unwrap', 'sort_complex', 'disp',