8000 MNT bare asserts (#12571) · jnothman/scikit-learn@01e1529 · GitHub
[go: up one dir, main page]

Skip to content

Commit 01e1529

Browse files
Ramil Nugmanovjnothman
authored andcommitted
MNT bare asserts (scikit-learn#12571)
1 parent b519452 commit 01e1529

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

sklearn/ensemble/tests/test_voting_classifier.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from sklearn.utils.testing import assert_almost_equal, assert_array_equal
77
from sklearn.utils.testing import assert_array_almost_equal
8-
from sklearn.utils.testing import assert_equal, assert_true, assert_false
8+
from sklearn.utils.testing import assert_equal
99
from sklearn.utils.testing import assert_raise_message
1010
from sklearn.utils.testing import assert_warns_message
1111
from sklearn.exceptions import NotFittedError
@@ -338,7 +338,7 @@ def test_set_params():
338338
eclf2 = VotingClassifier([('lr', clf1), ('nb', clf3)], voting='soft',
339339
weights=[1, 2])
340340
eclf2.set_params(nb=clf2).fit(X, y)
341-
assert_false(hasattr(eclf2, 'nb'))
341+
assert not hasattr(eclf2, 'nb')
342342

343343
assert_array_equal(eclf1.predict(X), eclf2.predict(X))
344344
assert_array_almost_equal(eclf1.predict_proba(X), eclf2.predict_proba(X))
@@ -375,8 +375,8 @@ def test_set_estimator_none():
375375

376376
assert dict(eclf2.estimators)["rf"] is None
377377
assert len(eclf2.estimators_) == 2
378-
assert_true(all([not isinstance(est, RandomForestClassifier) for est in
379-
eclf2.estimators_]))
378+
assert all(isinstance(est, (LogisticRegression, GaussianNB))
379+
for est in eclf2.estimators_)
380380
assert eclf2.get_params()["rf"] is None
381381

382382
eclf1.set_params(voting='soft').fit(X, y)

0 commit comments

Comments
 (0)
0