MNT Remove warning in logistic regression cv scoring (scikit-learn#15184

)
randomgeek78 · Oct 18, 2019 · e489aab · e489aab
1 parent 56edce8
commit e489aab
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/sklearn/linear_model/logistic.py b/sklearn/linear_model/logistic.py
@@ -2248,15 +2248,7 @@ def score(self, X, y, sample_weight=None):
             Score of self.predict(X) wrt. y.
 
         """
-
-        if self.scoring is not None:
-            warnings.warn("The long-standing behavior to use the "
-                          "accuracy score has changed. The scoring "
-                          "parameter is now used. "
-                          "This warning will disappear in version 0.22.",
-                          ChangedBehaviorWarning)
         scoring = self.scoring or 'accuracy'
-
         scoring = get_scorer(scoring)
 
         return scoring(self, X, y, sample_weight=sample_weight)
diff --git a/sklearn/linear_model/tests/test_logistic.py b/sklearn/linear_model/tests/test_logistic.py
@@ -129,8 +129,7 @@ def __call__(self, model, X, y, sample_weight=None):
 
     # reset mock_scorer
     mock_scorer.calls = 0
-    with pytest.warns(ChangedBehaviorWarning):
-        custom_score = lr.score(X, lr.predict(X))
+    custom_score = lr.score(X, lr.predict(X))
 
     assert custom_score == mock_scorer.scores[0]
     assert mock_scorer.calls == 1