1818from .base import clone , TransformerMixin
1919from .externals .joblib import Parallel , delayed
2020from .externals import six
21- from .utils .metaestimators import if_delegate_has_method , _BaseComposition
21+ from .utils .metaestimators import if_delegate_has_method
2222from .utils import Bunch
2323from .utils .validation import check_memory
2424
25+ from .utils .metaestimators import _BaseComposition
2526
2627__all__ = ['Pipeline' , 'FeatureUnion' ]
2728
@@ -627,16 +628,16 @@ def make_pipeline(*steps, **kwargs):
627628 return Pipeline (_name_estimators (steps ), memory = memory , verbose = verbose )
628629
629630
630- def _fit_one_transformer (trans , X , y , verbose = False , idx = None ,
631+ def _fit_one_transformer (transformer , X , y , verbose = False , idx = None ,
631632 total_steps = None , name = None ):
632633 # idx, total_steps and name are not required when verbosity is disabled
633634 step_start_time = time .time ()
634- trans = trans .fit (X , y )
635+ transformer = transformer .fit (X , y )
635636 step_time_elapsed = time .time () - step_start_time
636637 if verbose :
637638 _pretty_print ('[FeatureUnion] (step %d of %d) %s ... %.5fs' %
638639 (idx + 1 , total_steps , name , step_time_elapsed ))
639- return trans
640+ return transformer
640641
641642
642643def _transform_one (transformer , weight , X ):
@@ -647,22 +648,22 @@ def _transform_one(transformer, weight, X):
647648 return res * weight
648649
649650
650- def _fit_transform_one (trans , weight , X , y , verbose = False , idx = None ,
651+ def _fit_transform_one (transformer , weight , X , y , verbose = False , idx = None ,
651652 total_steps = None , name = None , ** fit_params ):
652653 # idx, total_steps and name are not required when verbosity is disabled
653654 step_start_time = time .time ()
654- if hasattr (trans , 'fit_transform' ):
655- res = trans .fit_transform (X , y , ** fit_params )
655+ if hasattr (transformer , 'fit_transform' ):
656+ res = transformer .fit_transform (X , y , ** fit_params )
656657 else :
657- res = trans .fit (X , y , ** fit_params ).transform (X )
658+ res = transformer .fit (X , y , ** fit_params ).transform (X )
658659 step_time_elapsed = time .time () - step_start_time
659660 if verbose :
660661 _pretty_print ('[FeatureUnion] (step %d of %d) %s ... %.5fs' %
661662 (idx + 1 , total_steps , name , step_time_elapsed ))
662663 # if we have a weight for this transformer, multiply output
663664 if weight is None :
664- return res , trans
665- return res * weight , trans
665+ return res , transformer
666+ return res * weight , transformer
666667
667668
668669class FeatureUnion (_BaseComposition , TransformerMixin ):
0 commit comments