summaryrefslogtreecommitdiff
path: root/scipy/base/numeric.py
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2005-10-14 01:47:07 +0000
committerTravis Oliphant <oliphant@enthought.com>2005-10-14 01:47:07 +0000
commit9f1286587474fb3fcbdf2020b1fe47400ca20b68 (patch)
treea681e59eacb4a56d7c1b6690ec7055f3fbe71d0d /scipy/base/numeric.py
parent2cfd18d956739dbb13bd312ec6b60b087f21ad53 (diff)
downloadnumpy-9f1286587474fb3fcbdf2020b1fe47400ca20b68.tar.gz
Fixed subclass PyArray_New error segfault. Updated f2py for newscipy (a little)
Diffstat (limited to 'scipy/base/numeric.py')
-rw-r--r--scipy/base/numeric.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/scipy/base/numeric.py b/scipy/base/numeric.py
index 77edcdf99..8e0306877 100644
--- a/scipy/base/numeric.py
+++ b/scipy/base/numeric.py
@@ -27,17 +27,17 @@ fastCopyAndTranspose = multiarray._fastCopyAndTranspose
register_dtype = multiarray.register_dtype
can_cast = multiarray.can_cast
-def asarray(a, dtype=None):
- """asarray(a,dtype=None) returns a as an array. Unlike array(),
+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
to base class ndarray.
"""
- return array(a, dtype, copy=0)
+ return array(a, dtype, copy=0, fortran=fortran)
-def asanyarray(a, dtype=None):
+def asanyarray(a, dtype=None,copy=0,fortran=False):
"""will pass subclasses through...
"""
- return array(a, dtype, copy=0, subok=1)
+ return array(a, dtype, copy=0, fortran=fortran, subok=1)
def isfortran(a):
return a.flags['FNC']