diff --git a/TODO.txt b/TODO.txt index d789e6da..48625aa3 100644 --- a/TODO.txt +++ b/TODO.txt @@ -17,4 +17,3 @@ Version 0.10 * Remove deprecated function `filter.median_filter` * Enable doctests of experimental `skimage.feature.brief` * Remove deprecated `skimage.segmentation.visualize_boundaries` -* Remove deprecated `skimage.morphology.greyscale_*` diff --git a/skimage/morphology/__init__.py b/skimage/morphology/__init__.py index 4788c308..bee5ac13 100644 --- a/skimage/morphology/__init__.py +++ b/skimage/morphology/__init__.py @@ -1,9 +1,7 @@ from .binary import (binary_erosion, binary_dilation, binary_opening, binary_closing) from .grey import (erosion, dilation, opening, closing, white_tophat, - black_tophat, greyscale_erode, greyscale_dilate, - greyscale_open, greyscale_close, greyscale_white_top_hat, - greyscale_black_top_hat) + black_tophat) from .selem import (square, rectangle, diamond, disk, cube, octahedron, ball, octagon, star) from .ccomp import label @@ -24,12 +22,6 @@ __all__ = ['binary_erosion', 'closing', 'white_tophat', 'black_tophat', - 'greyscale_erode', - 'greyscale_dilate', - 'greyscale_open', - 'greyscale_close', - 'greyscale_white_top_hat', - 'greyscale_black_top_hat', 'square', 'rectangle', 'diamond', diff --git a/skimage/morphology/grey.py b/skimage/morphology/grey.py index ef7158b2..13e9dfbb 100644 --- a/skimage/morphology/grey.py +++ b/skimage/morphology/grey.py @@ -5,9 +5,7 @@ from . import cmorph __all__ = ['erosion', 'dilation', 'opening', 'closing', 'white_tophat', - 'black_tophat', 'greyscale_erode', 'greyscale_dilate', - 'greyscale_open', 'greyscale_close', 'greyscale_white_top_hat', - 'greyscale_black_top_hat'] + 'black_tophat'] def erosion(image, selem, out=None, shift_x=False, shift_y=False): @@ -313,33 +311,3 @@ def black_tophat(image, selem, out=None): out = closing(image, selem, out=out) out = out - image return out - - -def greyscale_erode(*args, **kwargs): - warnings.warn("`greyscale_erode` renamed `erosion`.") - return erosion(*args, **kwargs) - - -def greyscale_dilate(*args, **kwargs): - warnings.warn("`greyscale_dilate` renamed `dilation`.") - return dilation(*args, **kwargs) - - -def greyscale_open(*args, **kwargs): - warnings.warn("`greyscale_open` renamed `opening`.") - return opening(*args, **kwargs) - - -def greyscale_close(*args, **kwargs): - warnings.warn("`greyscale_close` renamed `closing`.") - return closing(*args, **kwargs) - - -def greyscale_white_top_hat(*args, **kwargs): - warnings.warn("`greyscale_white_top_hat` renamed `white_tophat`.") - return white_tophat(*args, **kwargs) - - -def greyscale_black_top_hat(*args, **kwargs): - warnings.warn("`greyscale_black_top_hat` renamed `black_tophat`.") - return black_tophat(*args, **kwargs)