From cdbcee59fbe407dcfa3a81fc18f95eca4e8ec6c4 Mon Sep 17 00:00:00 2001 From: Travis Oliphant Date: Tue, 21 Mar 2006 05:21:43 +0000 Subject: Fix reshape to always interpret as C-contiguous unless fortran=True is given or fortran=None and array is already fortran array. --- numpy/core/numeric.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'numpy/core/numeric.py') diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index d275367db..1769894a5 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -107,20 +107,20 @@ can_cast = multiarray.can_cast lexsort = multiarray.lexsort -def asarray(a, dtype=None, fortran=False, ndmin=0): +def asarray(a, dtype=None, fortran=None, ndmin=0): """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=False, fortran=fortran, ndmin=ndmin) -def asanyarray(a, dtype=None, copy=False, fortran=False, ndmin=0): +def asanyarray(a, dtype=None, copy=False, fortran=None, ndmin=0): """will pass subclasses through... """ return array(a, dtype, copy=copy, fortran=fortran, subok=1, ndmin=ndmin) def isfortran(a): - return a.flags['FNC'] + return a.flags.fnc _mode_from_name_dict = {'v': 0, 's' : 1, -- cgit v1.2.1