FIX deprecated import locations in model_selection

raghavrv · raghavrv · commit c34f5e43b9a2 · 2016-01-09T04:02:26.000+01:00
diff --git a/sklearn/model_selection/_search.py b/sklearn/model_selection/_search.py
@@ -20,7 +20,7 @@
 import numpy as np
 
 from ..base import BaseEstimator, is_classifier, clone
-from ..base import MetaEstimatorMixin, ChangedBehaviorWarning
+from ..base import MetaEstimatorMixin
 from ._split import check_cv
 from ._validation import _fit_and_score
 from ..externals.joblib import Parallel, delayed
@@ -31,6 +31,7 @@
 from ..utils.validation import _num_samples, indexable
 from ..utils.metaestimators import if_delegate_has_method
 from ..metrics.scorer import check_scoring
+from ..exceptions import ChangedBehaviorWarning
 
 
 __all__ = ['GridSearchCV', 'ParameterGrid', 'fit_grid_point',
diff --git a/sklearn/model_selection/tests/test_search.py b/sklearn/model_selection/tests/test_search.py
@@ -44,8 +44,7 @@
 from sklearn.model_selection import ParameterGrid
 from sklearn.model_selection import ParameterSampler
 
-# TODO Import from sklearn.exceptions once merged.
-from sklearn.base import ChangedBehaviorWarning
+from sklearn.exceptions import ChangedBehaviorWarning
 from sklearn.model_selection._validation import FitFailedWarning
 
 from sklearn.svm import LinearSVC, SVC
