diff --git a/skimage/util/_warnings.py b/skimage/_shared/_warnings.py similarity index 100% rename from skimage/util/_warnings.py rename to skimage/_shared/_warnings.py diff --git a/skimage/_shared/utils.py b/skimage/_shared/utils.py index 980ff639..9148e7ff 100644 --- a/skimage/_shared/utils.py +++ b/skimage/_shared/utils.py @@ -4,8 +4,9 @@ import sys import six +from ._warnings import all_warnings -__all__ = ['deprecated', 'get_bound_method_class'] +__all__ = ['deprecated', 'get_bound_method_class', 'all_warnings'] class skimage_deprecation(Warning): diff --git a/skimage/util/__init__.py b/skimage/util/__init__.py index 07712230..5577e46b 100644 --- a/skimage/util/__init__.py +++ b/skimage/util/__init__.py @@ -7,8 +7,6 @@ from .arraypad import pad from ._regular_grid import regular_grid from .unique import unique_rows -from ._warnings import all_warnings - __all__ = ['img_as_float', 'img_as_int', diff --git a/skimage/util/tests/test_shape.py b/skimage/util/tests/test_shape.py index 8f4c4291..ee897e7c 100644 --- a/skimage/util/tests/test_shape.py +++ b/skimage/util/tests/test_shape.py @@ -3,7 +3,7 @@ from nose.tools import raises from numpy.testing import assert_equal, assert_warns from skimage.util.shape import view_as_blocks, view_as_windows -from skimage.util import all_warnings +from skimage._shared.utils import all_warnings @raises(TypeError)