diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-08-29 17:56:21 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-08-29 17:56:21 +0000 |
| commit | 63326185c04be2795a7a33028d427e9c8c31c900 (patch) | |
| tree | 62fb5b9f5f7b6e518346fa0893e408fa24755021 /numpy/numarray/functions.py | |
| parent | 064c8eb43637e920f6019215b00ef1593d74b0c1 (diff) | |
| download | numpy-63326185c04be2795a7a33028d427e9c8c31c900.tar.gz | |
Clean-up some un-needed default axes. Fix default axes of ma.sum and ma.product
Diffstat (limited to 'numpy/numarray/functions.py')
| -rw-r--r-- | numpy/numarray/functions.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/numarray/functions.py b/numpy/numarray/functions.py index 95738d220..55922e9fe 100644 --- a/numpy/numarray/functions.py +++ b/numpy/numarray/functions.py @@ -206,7 +206,7 @@ def fromfile(infile, type=None, shape=None, sizing=STRICT, ##file whose size may be determined before allocation, should be ##quick -- only one allocation will be needed. - recsize = dtype.itemsize * N.product([i for i in shape if i != -1],axis=0) + recsize = dtype.itemsize * N.product([i for i in shape if i != -1]) blocksize = max(_BLOCKSIZE/recsize, 1)*recsize ##try to estimate file size @@ -268,7 +268,7 @@ def fromstring(datastring, type=None, shape=None, typecode=None, dtype=None): if shape is None: count = -1 else: - count = N.product(shape,axis=0)*dtype.itemsize + count = N.product(shape)*dtype.itemsize res = N.fromstring(datastring, count=count) if shape is not None: res.shape = shape |