diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-08-04 18:47:25 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-08-04 18:47:25 +0000 |
| commit | a9046559ee562323b483ffbb80eb4b4d0cb11d36 (patch) | |
| tree | d6875105a0c2999d512f853886ae975030016bc0 /numpy/oldnumeric | |
| parent | 7ffd787c0702925a985fedfc0c988059a77c2b61 (diff) | |
| download | numpy-a9046559ee562323b483ffbb80eb4b4d0cb11d36.tar.gz | |
Convert so that axis arguments are consistent for methods and functions. Place functions for which this changes the Numeric default into oldnumeric.
Diffstat (limited to 'numpy/oldnumeric')
| -rw-r--r-- | numpy/oldnumeric/__init__.py | 12 | ||||
| -rw-r--r-- | numpy/oldnumeric/compat.py | 4 |
2 files changed, 15 insertions, 1 deletions
diff --git a/numpy/oldnumeric/__init__.py b/numpy/oldnumeric/__init__.py index 439cfe907..67874f814 100644 --- a/numpy/oldnumeric/__init__.py +++ b/numpy/oldnumeric/__init__.py @@ -2,20 +2,32 @@ from numpy import * from compat import * from olddefaults import * +from typeconv import * +from functions import * import numpy import compat import olddefaults +import typeconv +import functions __version__ = numpy.__version__ __all__ = ['__version__'] __all__ += numpy.__all__ __all__ += compat.__all__ +__all__ += typeconv.__all__ for name in olddefaults.__all__: if name not in __all__: __all__.append(name) +for name in functions.__all__: + if name not in __all__: + __all__.apend(name) + +del name del numpy del compat del olddefaults +del functions +del typeconv diff --git a/numpy/oldnumeric/compat.py b/numpy/oldnumeric/compat.py index 0a4b41228..3c8cf9b70 100644 --- a/numpy/oldnumeric/compat.py +++ b/numpy/oldnumeric/compat.py @@ -7,7 +7,7 @@ __all__ = ['NewAxis', 'UInt8','UInt16','UInt32', 'UnsignedInt32', 'UnsignedInteger', # UnsignedInt64 and Unsigned128 added below if possible # same for Int64 and Int128, Float128, and Complex128 - 'Int8', 'Int16', 'Int32', + 'Int8', 'Int16', 'Int32', 'Int0', 'Int', 'Float0', 'Float', 'Complex0', 'Complex', 'PyObject', 'Float32', 'Float64', 'Float16', 'Float8', 'Complex32', 'Complex64', 'Complex8', 'Complex16', @@ -19,6 +19,7 @@ __all__ = ['NewAxis', 'dump', 'dumps' ] + import numpy.core.multiarray as mu import numpy.core.umath as um import numpy.core.numerictypes as nt @@ -38,6 +39,7 @@ multiarray = mu def sarray(a, dtype=None, copy=False): return array(a, dtype, copy) + #Use this to add a new axis to an array #compatibility only NewAxis = None |