diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2005-12-05 21:56:27 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2005-12-05 21:56:27 +0000 |
| commit | 73eff17e359d08053183fc0aa4280261ca580dbd (patch) | |
| tree | 71406dab94d9edd803cef57eaad8c805d4818db1 /scipy/base/numeric.py | |
| parent | 9db8e4f9cb95484af086951c0e22d7d6947b744b (diff) | |
| download | numpy-73eff17e359d08053183fc0aa4280261ca580dbd.tar.gz | |
Fixed up tuple as data descriptor and added datadescr for descriptor constructor
Diffstat (limited to 'scipy/base/numeric.py')
| -rw-r--r-- | scipy/base/numeric.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scipy/base/numeric.py b/scipy/base/numeric.py index 9fb40065a..28e351d66 100644 --- a/scipy/base/numeric.py +++ b/scipy/base/numeric.py @@ -1,5 +1,5 @@ __all__ = ['newaxis', 'ndarray', 'bigndarray', 'flatiter', 'ufunc', - 'arange', 'array', 'zeros', 'empty', 'broadcast', + 'arange', 'array', 'zeros', 'empty', 'broadcast', 'datadescr', 'fromstring', 'fromfile', 'frombuffer','newbuffer','getbuffer', 'where', 'concatenate', 'fastCopyAndTranspose', 'register_dtype', 'set_numeric_ops', 'can_cast', @@ -48,6 +48,7 @@ ndarray = multiarray.ndarray bigndarray = multiarray.bigndarray flatiter = multiarray.flatiter broadcast = multiarray.broadcast +datadescr=multiarray.datadescr ufunc = type(sin) arange = multiarray.arange @@ -67,6 +68,7 @@ set_numeric_ops = multiarray.set_numeric_ops can_cast = multiarray.can_cast + 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 |