FIX doctests failing on Numpy 1.6

jnothman · jnothman · commit d5a91e8d8073 · 2014-12-21T23:47:53.000+11:00
diff --git a/sklearn/neighbors/base.py b/sklearn/neighbors/base.py
@@ -445,8 +445,12 @@ class from an array representing our data set and ask who's
         >>> neigh = NearestNeighbors(radius=1.6)
         >>> neigh.fit(samples) # doctest: +ELLIPSIS
         NearestNeighbors(algorithm='auto', leaf_size=30, ...)
-        >>> print(neigh.radius_neighbors([1., 1., 1.])) # doctest: +ELLIPSIS
-        (array([array([ 1.5,  0.5])]...), array([array([1, 2])]...)
+        >>> dist, ind = neigh.radius_neighbors([1., 1., 1.])
+        ...    # doctest: +ELLIPSIS
+        >>> dist[0]
+        array([ 1.5,  0.5])
+        >>> ind[0]
+        array([1, 2])
 
         The first array returned contains the distances to all points which
         are closer than 1.6, while the second array returned contains their
diff --git a/sklearn/neighbors/unsupervised.py b/sklearn/neighbors/unsupervised.py
@@ -64,8 +64,8 @@ class NearestNeighbors(NeighborsBase, KNeighborsMixin,
       ... #doctest: +ELLIPSIS
       array([[2, 0]]...)
 
-      >>> neigh.radius_neighbors([0, 0, 1.3], 0.4, return_distance=False)
-      array([array([2])], dtype=object)
+      >>> neigh.radius_neighbors([0, 0, 1.3], 0.4, return_distance=False)[0]
+      array([2])
 
     See also
     --------
