Test the changes.

aashil · aashil · commit 1e8d7c5e6865 · 2016-12-09T00:47:43.000-05:00
diff --git a/sklearn/metrics/regression.py b/sklearn/metrics/regression.py
@@ -91,9 +91,9 @@ def _check_reg_targets(y_true, y_pred, multioutput):
     multioutput_options = (None, 'raw_values', 'uniform_average',
                            'variance_weighted')
     if isinstance(multioutput, string_types) and multioutput not in multioutput_options:
-        raise ValueError("Invalid multioutput value")
+        raise ValueError("Invalid multioutput option")
 
-    elif multioutput is not None:
+    elif isinstance(multioutput, string_types) and multioutput is not None and multioutput in multioutput_options:
         multioutput = check_array(multioutput, ensure_2d=False)
         if n_outputs == 1:
             raise ValueError("Custom weights are useful only in "
