summaryrefslogtreecommitdiff
path: root/numpy/core/ma.py
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2006-03-24 22:12:48 +0000
committerTravis Oliphant <oliphant@enthought.com>2006-03-24 22:12:48 +0000
commit28b7d9fb65da6e36eff3158f77b2a023edf7f733 (patch)
tree9075b6f51ca22d2ee6ce2934962e50ee43d47a28 /numpy/core/ma.py
parent76612bfed9caef1f619c12bdd867b4974e93d8f4 (diff)
downloadnumpy-28b7d9fb65da6e36eff3158f77b2a023edf7f733.tar.gz
Changed fortran= keywords to order= keywords
Diffstat (limited to 'numpy/core/ma.py')
-rw-r--r--numpy/core/ma.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/numpy/core/ma.py b/numpy/core/ma.py
index d35a96636..d6a4378a0 100644
--- a/numpy/core/ma.py
+++ b/numpy/core/ma.py
@@ -504,7 +504,7 @@ class MaskedArray (object):
any computation.
Construction:
- x = array(data, dtype=None, copy=True, fortran=False,
+ x = array(data, dtype=None, copy=True, order=False,
mask = nomask, fill_value=None)
If copy=False, every effort is made not to copy the data:
@@ -527,9 +527,9 @@ class MaskedArray (object):
The fill_value is not used for computation within this module.
"""
__array_priority__ = 10.1
- def __init__(self, data, dtype=None, copy=True, fortran=False,
+ def __init__(self, data, dtype=None, copy=True, order=False,
mask=nomask, fill_value=None):
- """array(data, dtype=None, copy=True, fortran=False, mask=nomask, fill_value=None)
+ """array(data, dtype=None, copy=True, order=False, mask=nomask, fill_value=None)
If data already a numeric array, its dtype becomes the default value of dtype.
"""
if dtype is None:
@@ -556,12 +556,12 @@ class MaskedArray (object):
need_data_copied = True
else:
need_data_copied = False #because I'll do it now
- c = numeric.array(data, dtype=tc, copy=True, fortran=fortran)
+ c = numeric.array(data, dtype=tc, copy=True, order=order)
tc = c.dtype
if need_data_copied:
if tc == c.dtype:
- self._data = numeric.array(c, dtype=tc, copy=True, fortran=fortran)
+ self._data = numeric.array(c, dtype=tc, copy=True, order=order)
else:
self._data = c.astype(tc)
else: