FIX deprecation message for 1d data

ogrisel · ogrisel · commit 250507ffa616 · 2015-09-10T09:55:35.000+02:00
diff --git a/sklearn/preprocessing/data.py b/sklearn/preprocessing/data.py
@@ -46,10 +46,13 @@
     'minmax_scale',
 ]
 
-DEPRECATION_MSG_1D = ("Passing 1d arrays as data is deprecated and "
-"will be removed in 0.18. Reshape your data either using"
-"X.reshape(-1, 1) if your data has a single feature or"
-"X.reshape(1, -1) if it contains a single sample.")
+DEPRECATION_MSG_1D = (
+    "Passing 1d arrays as data is deprecated in 0.17 and will "
+    "raise ValueError in 0.19. Reshape your data either using "
+    "X.reshape(-1, 1) if your data has a single feature or "
+    "X.reshape(1, -1) if it contains a single sample."
+)
+
 
 def _mean_and_std(X, axis=0, with_mean=True, with_std=True):
     """Compute mean and std deviation for centering, scaling.
diff --git a/sklearn/utils/validation.py b/sklearn/utils/validation.py
@@ -365,11 +365,12 @@ def check_array(array, accept_sparse=None, dtype="numeric", order=None,
 
         if ensure_2d:
             if array.ndim == 1:
-                warnings.warn("Passing 1d arrays as data is deprecated and "
-                "will be removed in 0.18. Reshape your data either using"
-                "X.reshape(-1, 1) if your data has a single feature or"
-                "X.reshape(1, -1) if it contains a single sample.",
-                              DeprecationWarning)
+                warnings.warn(
+                    "Passing 1d arrays as data is deprecated in 0.17 and will"
+                    "raise ValueError in 0.19. Reshape your data either using "
+                    "X.reshape(-1, 1) if your data has a single feature or "
+                    "X.reshape(1, -1) if it contains a single sample.",
+                    DeprecationWarning)
             array = np.atleast_2d(array)
             # To ensure that array flags are maintained
             array = np.array(array, dtype=dtype, order=order, copy=copy)
