diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2017-08-06 11:36:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-06 11:36:11 -0500 |
| commit | f307cec3962926558b6387ebb4ab8d3f4ea3aa34 (patch) | |
| tree | b902a845cb2b7a64f78aae7a10776c3daeb16e50 /numpy/lib/tests/test_function_base.py | |
| parent | d6539868b353e211b4aaa3a683101e094b3ee1df (diff) | |
| parent | 091b8c3b16d39d18f6921f9a17d06c1652b40dca (diff) | |
| download | numpy-f307cec3962926558b6387ebb4ab8d3f4ea3aa34.tar.gz | |
Merge pull request #9505 from eric-wieser/fix-issubdtype
BUG: issubdtype is inconsistent on types and dtypes
Diffstat (limited to 'numpy/lib/tests/test_function_base.py')
| -rw-r--r-- | numpy/lib/tests/test_function_base.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/numpy/lib/tests/test_function_base.py b/numpy/lib/tests/test_function_base.py index ad840f8ef..151c20a4b 100644 --- a/numpy/lib/tests/test_function_base.py +++ b/numpy/lib/tests/test_function_base.py @@ -1711,16 +1711,16 @@ class TestHistogram(object): # Check the type of the returned histogram a = np.arange(10) + .5 h, b = histogram(a) - assert_(np.issubdtype(h.dtype, int)) + assert_(np.issubdtype(h.dtype, np.integer)) h, b = histogram(a, normed=True) - assert_(np.issubdtype(h.dtype, float)) + assert_(np.issubdtype(h.dtype, np.floating)) h, b = histogram(a, weights=np.ones(10, int)) - assert_(np.issubdtype(h.dtype, int)) + assert_(np.issubdtype(h.dtype, np.integer)) h, b = histogram(a, weights=np.ones(10, float)) - assert_(np.issubdtype(h.dtype, float)) + assert_(np.issubdtype(h.dtype, np.floating)) def test_f32_rounding(self): # gh-4799, check that the rounding of the edges works with float32 |