summaryrefslogtreecommitdiff
path: root/scipy/base/numeric.py
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2005-11-20 08:13:58 +0000
committerTravis Oliphant <oliphant@enthought.com>2005-11-20 08:13:58 +0000
commita1e5c5bc399f95f4ee5994f55ceb1267b233ce12 (patch)
treeb454b0e1ef3df11470295eda3c93dd137eca2431 /scipy/base/numeric.py
parenta4d16e5474254922bf4ea0ab76c4293aa2fba519 (diff)
downloadnumpy-a1e5c5bc399f95f4ee5994f55ceb1267b233ce12.tar.gz
Fix memmap some. Fix reductions on object arrays.
Diffstat (limited to 'scipy/base/numeric.py')
-rw-r--r--scipy/base/numeric.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/scipy/base/numeric.py b/scipy/base/numeric.py
index 0c4a3cb4c..f37947897 100644
--- a/scipy/base/numeric.py
+++ b/scipy/base/numeric.py
@@ -1,6 +1,6 @@
__all__ = ['newaxis', 'ndarray', 'bigndarray', 'flatiter', 'ufunc',
'arange', 'array', 'zeros', 'empty', 'multiter',
- 'fromstring', 'fromfile', 'frombuffer',
+ 'fromstring', 'fromfile', 'frombuffer','newbuffer','getbuffer',
'where', 'concatenate', 'fastCopyAndTranspose',
'register_dtype', 'set_numeric_ops', 'can_cast',
'asarray', 'asanyarray', 'isfortran', 'zeros_like', 'empty_like',
@@ -58,6 +58,7 @@ fromstring = multiarray.fromstring
fromfile = multiarray.fromfile
frombuffer = multiarray.frombuffer
newbuffer = multiarray.newbuffer
+getbuffer = multiarray.getbuffer
where = multiarray.where
concatenate = multiarray.concatenate
fastCopyAndTranspose = multiarray._fastCopyAndTranspose
@@ -65,6 +66,7 @@ register_dtype = multiarray.register_dtype
set_numeric_ops = multiarray.set_numeric_ops
can_cast = multiarray.can_cast
+
def asarray(a, dtype=None, fortran=False):
"""returns a as an array. Unlike array(),
no copy is performed if a is already an array. Subclasses are converted