FIX Fixed some imports after deprecations (scikit-learn#15345)

Author: NicolasHug

doc/modules/cross_validation.rst

@@ -241,7 +241,7 @@ predefined scorer names::
 
 Or as a dict mapping scorer name to a predefined or custom scoring function::
 
-    >>> from sklearn.metrics.scorer import make_scorer
+    >>> from sklearn.metrics import make_scorer
     >>> scoring = {'prec_macro': 'precision_macro',
     ...            'rec_macro': make_scorer(recall_score, average='macro')}
     >>> scores = cross_validate(clf, X, y, scoring=scoring,

sklearn/feature_selection/mutual_info_.py

@@ -5,7 +5,7 @@
 from scipy.sparse import issparse
 from scipy.special import digamma
 
-from ..metrics.cluster.supervised import mutual_info_score
+from ..metrics.cluster import mutual_info_score
 from ..neighbors import NearestNeighbors
 from ..preprocessing import scale
 from ..utils import check_random_state

sklearn/feature_selection/rfe.py

@@ -19,7 +19,7 @@
 from ..base import is_classifier
 from ..model_selection import check_cv
 from ..model_selection._validation import _score
-from ..metrics.scorer import check_scoring
+from ..metrics import check_scoring
 from .base import SelectorMixin
 
 

sklearn/linear_model/tests/test_logistic.py

@@ -9,7 +9,7 @@
 from sklearn.base import clone
 from sklearn.datasets import load_iris, make_classification
 from sklearn.metrics import log_loss
-from sklearn.metrics.scorer import get_scorer
+from sklearn.metrics import get_scorer
 from sklearn.model_selection import StratifiedKFold
 from sklearn.model_selection import GridSearchCV
 from sklearn.model_selection import train_test_split

sklearn/model_selection/_validation.py

@@ -177,7 +177,7 @@ def cross_validate(estimator, X, y=None, groups=None, scoring=None, cv=None,
     --------
     >>> from sklearn import datasets, linear_model
     >>> from sklearn.model_selection import cross_validate
-    >>> from sklearn.metrics.scorer import make_scorer
+    >>> from sklearn.metrics import make_scorer
     >>> from sklearn.metrics import confusion_matrix
     >>> from sklearn.svm import LinearSVC
     >>> diabetes = datasets.load_diabetes()

sklearn/model_selection/tests/test_validation.py

@@ -52,7 +52,7 @@
 from sklearn.metrics import precision_recall_fscore_support
 from sklearn.metrics import precision_score
 from sklearn.metrics import r2_score
-from sklearn.metrics.scorer import check_scoring
+from sklearn.metrics import check_scoring
 
 from sklearn.linear_model import Ridge, LogisticRegression, SGDClassifier
 from sklearn.linear_model import PassiveAggressiveClassifier, RidgeClassifier