From 2c170ca0b105698683c428d11cc5d9515ba1bdec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Orieux?= <orieux@iap.fr>
Date: Wed, 20 Nov 2013 11:05:53 +0100
Subject: [PATCH] Fix doctest

---
 skimage/restoration/uft.py    |  2 +-
 skimage/restoration/wiener.py | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/skimage/restoration/uft.py b/skimage/restoration/uft.py
index 25593af1..cc57ae34 100644
--- a/skimage/restoration/uft.py
+++ b/skimage/restoration/uft.py
@@ -85,7 +85,7 @@ def _circshift(inarray, shifts):
 
     Examples
     --------
-    >>> circshift(np.arange(10), 2)
+    >>> _circshift(np.arange(10), 2)
     array([8, 9, 0, 1, 2, 3, 4, 5, 6, 7])
 
     """
diff --git a/skimage/restoration/wiener.py b/skimage/restoration/wiener.py
index 0b8ac777..85b26afd 100644
--- a/skimage/restoration/wiener.py
+++ b/skimage/restoration/wiener.py
@@ -22,7 +22,7 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""Implementations deconvolution functions"""
+"""Implementations restoration functions"""
 
 from __future__ import division
 
@@ -40,7 +40,7 @@ __maintainer__ = "François Orieux"
 __email__ = "orieux@iap.fr"
 __status__ = "stable"
 __url__ = "http://research.orieux.fr"
-__keywords__ = "deconvolution, image"
+__keywords__ = "restoration, image"
 
 
 def wiener(data, psf, reg_val, reg=None, real=True):
@@ -79,13 +79,13 @@ def wiener(data, psf, reg_val, reg=None, real=True):
     Examples
     --------
     >>> import numpy as np
-    >>> from skimage import color, data, deconvolution
+    >>> from skimage import color, data, restoration
     >>> lena = color.rgb2gray(data.lena())
     >>> from scipy.signal import convolve2d
     >>> psf = np.ones((5, 5)) / 25
     >>> lena = convolve2d(lena, psf, 'same')
     >>> lena += 0.1 * lena.std() * np.random.standard_normal(lena.shape)
-    >>> deconvolved_lena = deconvolution.wiener(lena, psf, 1100)
+    >>> deconvolved_lena = restoration.wiener(lena, psf, 1100)
 
     Notes
     -----
@@ -214,13 +214,13 @@ def unsupervised_wiener(data, psf, reg=None, user_params=None):
     Examples
     --------
     >>> import numpy as np
-    >>> from skimage import color, data, deconvolution
+    >>> from skimage import color, data, restoration
     >>> lena = color.rgb2gray(data.lena())
     >>> from scipy.signal import convolve2d
     >>> psf = np.ones((5, 5)) / 25
     >>> lena = convolve2d(lena, psf, 'same')
     >>> lena += 0.1 * lena.std() * np.random.standard_normal(lena.shape)
-    >>> deconvolved_lena = deconvolution.unsupervised_wiener(lena, psf)
+    >>> deconvolved_lena = restoration.unsupervised_wiener(lena, psf)
 
     References
     ----------
@@ -340,13 +340,13 @@ def richardson_lucy(data, psf, iterations=50):
     Examples
     --------
     >>> import numpy as np
-    >>> from skimage import color, data, deconvolution
+    >>> from skimage import color, data, restoration
     >>> camera = color.rgb2gray(data.camera())
     >>> from scipy.signal import convolve2d
     >>> psf = np.ones((5, 5)) / 25
     >>> camera = convolve2d(camera, psf, 'same')
     >>> camera += 0.1 * camera.std() * np.random.standard_normal(camera.shape)
-    >>> deconvolved = deconvolution.richardson_lucy(camera, psf, 5)
+    >>> deconvolved = restoration.richardson_lucy(camera, psf, 5)
 
     References
     ----------