diff options
| author | Mark Wiebe <mwwiebe@gmail.com> | 2011-01-18 17:52:42 -0800 |
|---|---|---|
| committer | Mark Wiebe <mwwiebe@gmail.com> | 2011-01-18 17:54:55 -0800 |
| commit | beba8f4e7c7071d0619558a66f0a096ca705c1c5 (patch) | |
| tree | f1f606ceaee945cffc357a0e5ec4fabfd0791a80 /numpy/core/numeric.py | |
| parent | 81a28e7309e13f0a22464697b14c2c7d4c272ea5 (diff) | |
| download | numpy-beba8f4e7c7071d0619558a66f0a096ca705c1c5.tar.gz | |
ENH: core: Add functions PyArray_CanCastArrayTo and PyArray_ResultType
They have also been exposed to Python.
Diffstat (limited to 'numpy/core/numeric.py')
| -rw-r--r-- | numpy/core/numeric.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index a39ef62bd..8609fbc4b 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -2,8 +2,8 @@ __all__ = ['newaxis', 'ndarray', 'flatiter', 'newiter', 'nested_iters', 'ufunc', 'arange', 'array', 'zeros', 'count_nonzero', 'empty', 'broadcast', 'dtype', 'fromstring', 'fromfile', 'frombuffer', 'int_asbuffer', 'where', 'argwhere', - 'concatenate', 'fastCopyAndTranspose', 'lexsort', - 'set_numeric_ops', 'can_cast', 'promote_types', 'min_scalar_type', + 'concatenate', 'fastCopyAndTranspose', 'lexsort', 'set_numeric_ops', + 'can_cast', 'promote_types', 'min_scalar_type', 'result_type', 'asarray', 'asanyarray', 'ascontiguousarray', 'asfortranarray', 'isfortran', 'empty_like', 'zeros_like', 'correlate', 'convolve', 'inner', 'dot', 'outer', 'vdot', @@ -214,6 +214,7 @@ set_numeric_ops = multiarray.set_numeric_ops can_cast = multiarray.can_cast promote_types = multiarray.promote_types min_scalar_type = multiarray.min_scalar_type +result_type = multiarray.result_type lexsort = multiarray.lexsort compare_chararrays = multiarray.compare_chararrays putmask = multiarray.putmask |