From f280e0b13e5d76ae24f0c0f32bc8324703eb818e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= <jsch@demuc.de>
Date: Thu, 13 Mar 2014 18:24:59 -0400
Subject: [PATCH] Fix regular grid doctest

---
 skimage/transform/_geometric.py | 4 ++--
 skimage/util/_regular_grid.py   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/skimage/transform/_geometric.py b/skimage/transform/_geometric.py
index 23a8d5cc..8a7b4daf 100644
--- a/skimage/transform/_geometric.py
+++ b/skimage/transform/_geometric.py
@@ -1043,10 +1043,10 @@ def warp(image, inverse_map=None, map_args={}, output_shape=None, order=1,
 
     Use a callable (slow):
 
-    >>> def shift(xy):
+    >>> def shift_bottom(xy):
     ...     xy[:, 1] -= 10
     ...     return xy
-    >>> warped = warp(image, shift_right)
+    >>> warped = warp(image, shift_bottom)
 
     Use a transformation matrix to warp an image (fast):
 
diff --git a/skimage/util/_regular_grid.py b/skimage/util/_regular_grid.py
index f4955a2d..92b32082 100644
--- a/skimage/util/_regular_grid.py
+++ b/skimage/util/_regular_grid.py
@@ -29,21 +29,21 @@ def regular_grid(ar_shape, n_points):
     >>> ar = np.zeros((20, 40))
     >>> g = regular_grid(ar.shape, 8)
     >>> g
-    [slice(5.0, None, 10.0), slice(5.0, None, 10.0)]
+    [slice(5, None, 10), slice(5, None, 10)]
     >>> ar[g] = 1
     >>> ar.sum()
     8.0
     >>> ar = np.zeros((20, 40))
     >>> g = regular_grid(ar.shape, 32)
     >>> g
-    [slice(2.0, None, 5.0), slice(2.0, None, 5.0)]
+    [slice(2, None, 5), slice(2, None, 5)]
     >>> ar[g] = 1
     >>> ar.sum()
     32.0
     >>> ar = np.zeros((3, 20, 40))
     >>> g = regular_grid(ar.shape, 8)
     >>> g
-    [slice(1.0, None, 3.0), slice(5.0, None, 10.0), slice(5.0, None, 10.0)]
+    [slice(1, None, 3), slice(5, None, 10), slice(5, None, 10)]
     >>> ar[g] = 1
     >>> ar.sum()
     8.0