more instantiations

amueller · amueller · commit d28f52e52c63 · 2016-12-09T13:41:21.000-05:00
diff --git a/sklearn/utils/estimator_checks.py b/sklearn/utils/estimator_checks.py
@@ -739,7 +739,7 @@ def check_fit_score_takes_y(name, estimator):
             assert_true(args[1] in ["y", "Y"],
                         "Expected y or Y as second argument for method "
                         "%s of %s. Got arguments: %r."
-                        % (func_name, estimator.__name__, args))
+                        % (func_name, type(estimator).__name__, args))
 
 
 @ignore_warnings
@@ -1460,7 +1460,7 @@ def check_parameters_default_constructible(name, Estimator):
     # get rid of deprecation warnings
     with ignore_warnings(category=DeprecationWarning):
         if name in META_ESTIMATORS:
-            estimator = Estimator(LinearDiscriminantAnalysis)
+            estimator = Estimator(LinearDiscriminantAnalysis())
         else:
             estimator = Estimator()
         # test cloning
@@ -1612,7 +1612,7 @@ def transform(self, X):
         return
 
     else:
-        e = estimator()
+        e = clone(estimator)
 
     shallow_params = e.get_params(deep=False)
     deep_params = e.get_params(deep=True)
