remove the rest of _object_dtype_isnan usages

adrinjalali · adrinjalali · commit c6e867ea1fbb · 2020-02-07T15:12:32.000+01:00
diff --git a/sklearn/utils/tests/test_fixes.py b/sklearn/utils/tests/test_fixes.py
@@ -14,7 +14,6 @@
 
 from sklearn.utils.fixes import MaskedArray
 from sklearn.utils.fixes import _joblib_parallel_args
-from sklearn.utils.fixes import _object_dtype_isnan
 from sklearn.utils.fixes import loguniform
 
 
@@ -58,21 +57,6 @@ def test_joblib_parallel_args(monkeypatch, joblib_version):
         raise ValueError
 
 
-@pytest.mark.parametrize("dtype, val", ([object, 1],
-                                        [object, "a"],
-                                        [float, 1]))
-def test_object_dtype_isnan(dtype, val):
-    X = np.array([[val, np.nan],
-                  [np.nan, val]], dtype=dtype)
-
-    expected_mask = np.array([[False, True],
-                              [True, False]])
-
-    mask = _object_dtype_isnan(X)
-
-    assert_array_equal(mask, expected_mask)
-
-
 @pytest.mark.parametrize("low,high,base",
                          [(-1, 0, 10), (0, 2, np.exp(1)), (-1, 1, 2)])
 def test_loguniform(low, high, base):
diff --git a/sklearn/utils/validation.py b/sklearn/utils/validation.py
@@ -21,7 +21,6 @@
 from numpy.core.numeric import ComplexWarning
 import joblib
 
-from .fixes import _object_dtype_isnan
 from .. import get_config as _get_config
 from ..exceptions import NonBLASDotWarning, PositiveSpectrumWarning
 from ..exceptions import NotFittedError
@@ -61,7 +60,7 @@ def _assert_all_finite(X, allow_nan=False, msg_dtype=None):
             )
     # for object dtype data, we only check for NaNs (GH-13254)
     elif X.dtype == np.dtype('object') and not allow_nan:
-        if _object_dtype_isnan(X).any():
+        if np.isnan(X).any():
             raise ValueError("Input contains NaN")
 
 
