8000 ENH Replace *args with named arguments in make_union (#17472) · scikit-learn/scikit-learn@6df781b · GitHub
[go: up one dir, main page]

Skip to content

Commit 6df781b

Browse files
jaketaethomasjpfanIQRA MUHAMMAD
authored
ENH Replace *args with named arguments in make_union (#17472)
Co-authored-by: Thomas J. Fan <thomasjpfan@gmail.com> Co-authored-by: IQRA MUHAMMAD <iqra@iqra.local>
1 parent 5297365 commit 6df781b

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

sklearn/pipeline.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,7 +1013,7 @@ def _sk_visual_block_(self):
10131013
return _VisualBlock('parallel', transformers, names=names)
10141014

10151015

1016-
def make_union(*transformers, **kwargs):
1016+
def make_union(*transformers, n_jobs=None, verbose=False):
10171017
"""
10181018
Construct a FeatureUnion from the given transformers.
10191019
@@ -1055,12 +1055,5 @@ def make_union(*transformers, **kwargs):
10551055
FeatureUnion(transformer_list=[('pca', PCA()),
10561056
('truncatedsvd', TruncatedSVD())])
10571057
"""
1058-
n_jobs = kwargs.pop('n_jobs', None)
1059-
verbose = kwargs.pop('verbose', False)
1060-
if kwargs:
1061-
# We do not currently support `transformer_weights` as we may want to
1062-
# change its type spec in make_union
1063-
raise TypeError('Unknown keyword arguments: "{}"'
1064-
.format(list(kwargs.keys())[0]))
10651058
return FeatureUnion(
10661059
_name_estimators(transformers), n_jobs=n_jobs, verbose=verbose)

sklearn/tests/test_pipeline.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,8 @@ def test_make_union_kwargs():
519519
# invalid keyword parameters should raise an error message
520520
assert_raise_message(
521521
TypeError,
522-
'Unknown keyword arguments: "transformer_weights"',
522+
"make_union() got an unexpected "
523+
"keyword argument 'transformer_weights'",
523524
make_union, pca, mock, transformer_weights={'pca': 10, 'Transf': 1}
524525
)
525526

0 commit comments

Comments
 (0)
0