Consistently use relative imports

.gitignore

@@ -1,6 +1,7 @@
 *.pyc
 *~
 *#
+.#*
 *egg-info
 *.so
 *.pyd

skimage/_shared/testing.py

@@ -9,7 +9,7 @@ from tempfile import NamedTemporaryFile
 
 from numpy import testing
 import numpy as np
-from skimage._shared._warnings import expected_warnings
+from ._warnings import expected_warnings
 import warnings
 
 from .. import data, io, img_as_uint, img_as_float, img_as_int, img_as_ubyte
@@ -183,15 +183,19 @@ def mono_check(plugin, fmt='png'):
 def setup_test():
     """Default package level setup routine for skimage tests.
 
-    Import packages known to raise errors, and then
+    Import packages known to raise warnings, and then
     force warnings to raise errors.
-    Set a random seed
+
+    Also set a random seed.
     """
     warnings.simplefilter('default')
+
     from scipy import signal, ndimage, special, optimize, linalg
     from scipy.io import loadmat
     from skimage import viewer, filter
+
     np.random.seed(0)
+
     warnings.simplefilter('error')
 
 

skimage/_shared/tests/__init__.py

@@ -1,4 +1,4 @@
-from skimage._shared.testing import setup_test, teardown_test
+from ..testing import setup_test, teardown_test
 
 
 def setup():

skimage/color/tests/__init__.py

@@ -1,4 +1,4 @@
-from skimage._shared.testing import setup_test, teardown_test
+from ..._shared.testing import setup_test, teardown_test
 
 
 def setup():

skimage/data/__init__.py

@@ -41,7 +41,7 @@ def load(f):
     Returns
     -------
     img : ndarray
-        Image loaded from skimage.data_dir.
+        Image loaded from ``skimage.data_dir``.
     """
     use_plugin('pil')
     return imread(_os.path.join(data_dir, f))

skimage/data/tests/__init__.py

@@ -1,4 +1,4 @@
-from skimage._shared.testing import setup_test, teardown_test
+from ..._shared.testing import setup_test, teardown_test
 
 
 def setup():

skimage/draw/tests/__init__.py

@@ -1,4 +1,4 @@
-from skimage._shared.testing import setup_test, teardown_test
+from ..._shared.testing import setup_test, teardown_test
 
 
 def setup():

skimage/exposure/tests/__init__.py

@@ -1,4 +1,4 @@
-from skimage._shared.testing import setup_test, teardown_test
+from ..._shared.testing import setup_test, teardown_test
 
 
 def setup():

skimage/feature/tests/__init__.py

@@ -1,4 +1,4 @@
-from skimage._shared.testing import setup_test, teardown_test
+from ..._shared.testing import setup_test, teardown_test
 
 
 def setup():

skimage/filter/__init__.py

@@ -26,8 +26,8 @@ from ..filters.thresholding import (threshold_adaptive, threshold_otsu, threshol
 from ..filters import rank
 from ..filters.rank import median
 
-from skimage._shared.utils import deprecated
-from skimage import restoration
+from .._shared.utils import deprecated
+from .. import restoration
 denoise_bilateral = deprecated('skimage.restoration.denoise_bilateral')\
                         (restoration.denoise_bilateral)
 denoise_tv_bregman = deprecated('skimage.restoration.denoise_tv_bregman')\

skimage/filters/rank/tests/__init__.py

@@ -1,4 +1,4 @@
-from skimage._shared.testing import setup_test, teardown_test
+from ...._shared.testing import setup_test, teardown_test
 
 
 def setup():

skimage/filters/tests/__init__.py

@@ -1,4 +1,4 @@
-from skimage._shared.testing import setup_test, teardown_test
+from ..._shared.testing import setup_test, teardown_test
 
 
 def setup():

skimage/graph/tests/__init__.py

@@ -1,4 +1,4 @@
-from skimage._shared.testing import setup_test, teardown_test
+from ..._shared.testing import setup_test, teardown_test
 
 
 def setup():

skimage/io/tests/__init__.py

@@ -1,4 +1,4 @@
-from skimage._shared.testing import setup_test, teardown_test
+from ..._shared.testing import setup_test, teardown_test
 
 
 def setup():

skimage/measure/tests/__init__.py

@@ -1,4 +1,4 @@
-from skimage._shared.testing import setup_test, teardown_test
+from ..._shared.testing import setup_test, teardown_test
 
 
 def setup():

skimage/morphology/tests/__init__.py

@@ -1,4 +1,4 @@
-from skimage._shared.testing import setup_test, teardown_test
+from ..._shared.testing import setup_test, teardown_test
 
 
 def setup():

skimage/novice/tests/__init__.py

@@ -1,4 +1,4 @@
-from skimage._shared.testing import setup_test, teardown_test
+from ..._shared.testing import setup_test, teardown_test
 
 
 def setup():

skimage/restoration/non_local_means.py

@@ -1,7 +1,10 @@
 import numpy as np
-from skimage.restoration._nl_means_denoising import _nl_means_denoising_2d, \
-                    _nl_means_denoising_3d, \
-                    _fast_nl_means_denoising_2d, _fast_nl_means_denoising_3d
+from ._nl_means_denoising import (
+    _nl_means_denoising_2d,
+    _nl_means_denoising_3d,
+    _fast_nl_means_denoising_2d,
+    _fast_nl_means_denoising_3d)
+
 
 def nl_means_denoising(image, patch_size=7, patch_distance=11, h=0.1,
                        multichannel=True, fast_mode=True):
@@ -113,8 +116,7 @@ def nl_means_denoising(image, patch_size=7, patch_distance=11, h=0.1,
     else:  # 3-D grayscale
         if fast_mode:
             return np.array(_fast_nl_means_denoising_3d(image, s=patch_size,
-                                              d=patch_distance, h=h))
+                                                        d=patch_distance, h=h))
         else:
             return np.array(_nl_means_denoising_3d(image, patch_size,
-                                patch_distance, h))
-
+                            patch_distance, h))

skimage/restoration/tests/__init__.py

@@ -1,4 +1,4 @@
-from skimage._shared.testing import setup_test, teardown_test
+from ..._shared.testing import setup_test, teardown_test
 
 
 def setup():

skimage/segmentation/tests/__init__.py

@@ -1,4 +1,4 @@
-from skimage._shared.testing import setup_test, teardown_test
+from ..._shared.testing import setup_test, teardown_test
 
 
 def setup():

skimage/transform/tests/__init__.py

@@ -1,4 +1,4 @@
-from skimage._shared.testing import setup_test, teardown_test
+from ..._shared.testing import setup_test, teardown_test
 
 
 def setup():

skimage/util/tests/__init__.py

@@ -1,4 +1,4 @@
-from skimage._shared.testing import setup_test, teardown_test
+from ..._shared.testing import setup_test, teardown_test
 
 
 def setup():

skimage/viewer/tests/__init__.py

@@ -1,4 +1,4 @@
-from skimage._shared.testing import setup_test, teardown_test
+from ..._shared.testing import setup_test, teardown_test
 
 
 def setup():

skimage/viewer/utils/core.py

@@ -1,7 +1,7 @@
 import warnings
 
 import numpy as np
-from skimage.viewer.qt import QtWidgets, has_qt, FigureManagerQT, FigureCanvasQTAgg
+from ..qt import QtWidgets, has_qt, FigureManagerQT, FigureCanvasQTAgg
 import matplotlib as mpl
 from matplotlib.figure import Figure
 from matplotlib import _pylab_helpers

skimage/viewer/utils/dialogs.py

@@ -1,6 +1,6 @@
 import os
 
-from skimage.viewer.qt import QtGui
+from ..qt import QtGui
 
 
 __all__ = ['open_file_dialog', 'save_file_dialog']