diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2017-08-05 12:09:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-05 12:09:23 -0500 |
| commit | bfe43b26969231cfe8196868280c07f0c0aa8f50 (patch) | |
| tree | 88ad7478e033ce5980a365a479e22b78ba1cecaa /numpy/core/fromnumeric.py | |
| parent | 5ab02b15de72fa00d785f49c62466fe048264cc4 (diff) | |
| parent | 2b781f8967488dc007f8f0a1e6a7f49208788d12 (diff) | |
| download | numpy-bfe43b26969231cfe8196868280c07f0c0aa8f50.tar.gz | |
Merge pull request #9517 from charris/rebase-9508
MAINT/DOC: Use builtin when np.{x} is builtins.{x}.
Diffstat (limited to 'numpy/core/fromnumeric.py')
| -rw-r--r-- | numpy/core/fromnumeric.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py index 4922fc3e4..338248ce3 100644 --- a/numpy/core/fromnumeric.py +++ b/numpy/core/fromnumeric.py @@ -2246,7 +2246,7 @@ def amax(a, axis=None, out=None, keepdims=np._NoValue): >>> np.amax(a, axis=1) # Maxima along the second axis array([1, 3]) - >>> b = np.arange(5, dtype=np.float) + >>> b = np.arange(5, dtype=float) >>> b[2] = np.NaN >>> np.amax(b) nan @@ -2347,7 +2347,7 @@ def amin(a, axis=None, out=None, keepdims=np._NoValue): >>> np.amin(a, axis=1) # Minima along the second axis array([0, 2]) - >>> b = np.arange(5, dtype=np.float) + >>> b = np.arange(5, dtype=float) >>> b[2] = np.NaN >>> np.amin(b) nan @@ -2497,7 +2497,7 @@ def prod(a, axis=None, dtype=None, out=None, keepdims=np._NoValue): is the default platform integer: >>> x = np.array([1, 2, 3], dtype=np.int8) - >>> np.prod(x).dtype == np.int + >>> np.prod(x).dtype == int True """ |