Replace _squeeze with np.ravel

MechCoder · MechCoder · commit b421b3cf878d · 2016-09-02T14:18:13.000-07:00
diff --git a/sklearn/gaussian_process/kernels.py b/sklearn/gaussian_process/kernels.py
@@ -33,15 +33,6 @@
 from sklearn.externals.funcsigs import signature
 
 
-def _squeeze(length_scale):
-    """
-    np.squeeze that returns a scalar instead of a 0-D array.
-    """
-    length_scale = np.squeeze(length_scale).astype(float)
-    if length_scale.ndim == 0:
-        length_scale = np.asscalar(length_scale)
-    return length_scale
-
 def _check_length_scale(X, length_scale):
     length_scale = np.squeeze(length_scale).astype(float)
     if np.ndim(length_scale) > 1:
@@ -1213,7 +1204,7 @@ def __repr__(self):
                                                    self.length_scale)))
         else:  # isotropic
             return "{0}(length_scale={1:.3g})".format(
-                self.__class__.__name__, _squeeze(self.length_scale))
+                self.__class__.__name__, np.ravel(self.length_scale)[0])
 
 
 class Matern(RBF):
@@ -1359,7 +1350,8 @@ def __repr__(self):
                 self.nu)
         else:
             return "{0}(length_scale={1:.3g}, nu={2:.3g})".format(
-                self.__class__.__name__, _squeeze(self.length_scale), self.nu)
+                self.__class__.__name__, np.ravel(self.length_scale)[0],
+                self.nu)
 
 
 class RationalQuadratic(StationaryKernelMixin, NormalizedKernelMixin, Kernel):
