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/testing/tests/test_utils.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/testing/tests/test_utils.py')
| -rw-r--r-- | numpy/testing/tests/test_utils.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/testing/tests/test_utils.py b/numpy/testing/tests/test_utils.py index e2c105245..493c538af 100644 --- a/numpy/testing/tests/test_utils.py +++ b/numpy/testing/tests/test_utils.py @@ -61,7 +61,7 @@ class _GenericTest(object): def test_objarray(self): """Test object arrays.""" - a = np.array([1, 1], dtype=np.object) + a = np.array([1, 1], dtype=object) self._test_equal(a, 1) def test_array_likes(self): @@ -134,14 +134,14 @@ class TestArrayEqual(_GenericTest, unittest.TestCase): def test_recarrays(self): """Test record arrays.""" - a = np.empty(2, [('floupi', np.float), ('floupa', np.float)]) + a = np.empty(2, [('floupi', float), ('floupa', float)]) a['floupi'] = [1, 2] a['floupa'] = [1, 2] b = a.copy() self._test_equal(a, b) - c = np.empty(2, [('floupipi', np.float), ('floupa', np.float)]) + c = np.empty(2, [('floupipi', float), ('floupa', float)]) c['floupipi'] = a['floupi'].copy() c['floupa'] = a['floupa'].copy() |