Merge pull request scikit-learn#1695 from mrjbq7/issue-1694

COSMIT: fix excessive indentation.

Author: amueller

sklearn/cross_validation.py

@@ -1129,10 +1129,10 @@ def cross_val_score(estimator, X, y=None, scoring=None, cv=None, n_jobs=1,
     else:
         scorer = scoring
     if scorer is None and not hasattr(estimator, 'score'):
-            raise TypeError(
-                "If no scoring is specified, the estimator passed "
-                "should have a 'score' method. The estimator %s "
-                "does not." % estimator)
+        raise TypeError(
+            "If no scoring is specified, the estimator passed "
+            "should have a 'score' method. The estimator %s "
+            "does not." % estimator)
     # We clone the estimator to make sure that all the folds are
     # independent, and that it is pickle-able.
     fit_params = fit_params if fit_params is not None else {}