FIX/TST Make sure the old deprecation warning can be checked against

raghavrv · raghavrv · commit d53d4729ddf8 · 2016-02-25T15:43:11.000+01:00
diff --git a/sklearn/cross_validation.py b/sklearn/cross_validation.py
@@ -61,10 +61,10 @@
            'permutation_test_score',
            'train_test_split']
 
-@deprecated("FitFailedWarning has been moved into the sklearn.exceptions"
-            " module. It will not be available here from version 0.19")
-class FitFailedWarning(_FitFailedWarning):
-    pass
+FitFailedWarning = deprecated(
+    "FitFailedWarning has been moved into the sklearn.exceptions"
+    " module. It will not be available here from version 0.19")(
+            _FitFailedWarning)
 
 
 class _PartitionIterator(with_metaclass(ABCMeta)):
diff --git a/sklearn/tests/test_grid_search.py b/sklearn/tests/test_grid_search.py
@@ -42,14 +42,14 @@
 from sklearn.metrics import f1_score
 from sklearn.metrics import make_scorer
 from sklearn.metrics import roc_auc_score
-from sklearn.exceptions import FitFailedWarning
 from sklearn.exceptions import ChangedBehaviorWarning
 
 with warnings.catch_warnings():
     warnings.simplefilter('ignore')
     from sklearn.grid_search import GridSearchCV, RandomizedSearchCV
     from sklearn.grid_search import ParameterGrid, ParameterSampler
     from sklearn.cross_validation import KFold, StratifiedKFold
+    from sklearn.cross_validation import FitFailedWarning
 
 from sklearn.preprocessing import Imputer
 from sklearn.pipeline import Pipeline
