Moved __init__ to top. Test failure fixed?

maheshakya · maheshakya · commit 0c57afc8e30a · 2014-03-30T15:03:26.000+05:30
diff --git a/sklearn/feature_selection/from_model.py b/sklearn/feature_selection/from_model.py
@@ -200,6 +200,10 @@ class SelectFromModel(BaseEstimator, _LearntSelectorMixin,
         The base estimator from which the transformer is built.
     """
 
+    def __init__(self, estimator, threshold=None):
+        self.estimator = estimator
+        self.threshold = threshold
+
     def _validate_estimator(self, default=None):
         """Check the estimator and set the `estimator_` attribute."""
         if self.estimator is not None:
@@ -217,10 +221,6 @@ def _make_estimator(self):
 
         return estimator
 
-    def __init__(self, estimator=None, threshold=None):
-        self.estimator = estimator
-        self.threshold = threshold
-
     def _get_support_mask(self):
         return self.support_mask_
 
diff --git a/sklearn/utils/testing.py b/sklearn/utils/testing.py
@@ -439,9 +439,10 @@ def uninstall_mldata_mock():
 # Meta estimators need another estimator to be instantiated.
 meta_estimators = ["OneVsOneClassifier",
                    "OutputCodeClassifier", "OneVsRestClassifier", "RFE",
-                   "RFECV", "BaseEnsemble", "SelectFromModel"]
+                   "RFECV", "BaseEnsemble"]
 # estimators that there is no way to default-construct sensibly
-other = ["Pipeline", "FeatureUnion", "GridSearchCV", "RandomizedSearchCV"]
+other = ["Pipeline", "FeatureUnion",
+         "GridSearchCV", "RandomizedSearchCV", "SelectFromModel"]
 
 
 def all_estimators(include_meta_estimators=False, include_other=False,
