diff options
author | Travis Oliphant <oliphant@enthought.com> | 2006-03-24 22:12:48 +0000 |
---|---|---|
committer | Travis Oliphant <oliphant@enthought.com> | 2006-03-24 22:12:48 +0000 |
commit | 28b7d9fb65da6e36eff3158f77b2a023edf7f733 (patch) | |
tree | 9075b6f51ca22d2ee6ce2934962e50ee43d47a28 /numpy/core/defchararray.py | |
parent | 76612bfed9caef1f619c12bdd867b4974e93d8f4 (diff) | |
download | numpy-28b7d9fb65da6e36eff3158f77b2a023edf7f733.tar.gz |
Changed fortran= keywords to order= keywords
Diffstat (limited to 'numpy/core/defchararray.py')
-rw-r--r-- | numpy/core/defchararray.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/numpy/core/defchararray.py b/numpy/core/defchararray.py index a220919c5..9ef3cb376 100644 --- a/numpy/core/defchararray.py +++ b/numpy/core/defchararray.py @@ -15,7 +15,7 @@ _unicode = unicode class chararray(ndarray): def __new__(subtype, shape, itemsize=1, unicode=False, buffer=None, - offset=0, strides=None, fortran=0): + offset=0, strides=None, order=None): global _globalvar if unicode: @@ -26,12 +26,12 @@ class chararray(ndarray): _globalvar = 1 if buffer is None: self = ndarray.__new__(subtype, shape, (dtype, itemsize), - fortran=fortran) + order=order) else: self = ndarray.__new__(subtype, shape, (dtype, itemsize), buffer=buffer, offset=offset, strides=strides, - fortran=fortran) + order=order) _globalvar = 0 return self @@ -292,7 +292,7 @@ class chararray(ndarray): return self._generalmethod('zfill', broadcast(self, width)) -def array(obj, itemsize=None, copy=True, unicode=False, fortran=False): +def array(obj, itemsize=None, copy=True, unicode=False, order=None): if isinstance(obj, chararray): if itemsize is None: @@ -328,10 +328,10 @@ def array(obj, itemsize=None, copy=True, unicode=False, fortran=False): buffer=obj) # default - val = narray(obj, dtype=dtype, fortran=fortran, subok=1) + val = narray(obj, dtype=dtype, order=order, subok=1) return val.view(chararray) -def asarray(obj, itemsize=None, unicode=False, fortran=False): +def asarray(obj, itemsize=None, unicode=False, order=None): return array(obj, itemsize, copy=False, - unicode=unicode, fortran=fortran) + unicode=unicode, order=order) |