From bea0c1b7d17a674b8d1710d49ce6f1c8edf603fd Mon Sep 17 00:00:00 2001
From: emmanuelle <emmanuelle.gouillart@nsup.org>
Date: Sat, 29 Nov 2014 14:34:09 +0100
Subject: [PATCH 1/2] Added an import of `median` from the `filters` module
 (it's `filters.rank.median`, but it is convenient to have the very common
 median filter in `filters` as well)

---
 skimage/filters/__init__.py                 | 2 ++
 skimage/filters/tests/test_filter_import.py | 1 +
 2 files changed, 3 insertions(+)

diff --git a/skimage/filters/__init__.py b/skimage/filters/__init__.py
index 0228957e..7138fe8a 100644
--- a/skimage/filters/__init__.py
+++ b/skimage/filters/__init__.py
@@ -8,6 +8,7 @@ from ._gabor import gabor_kernel, gabor_filter
 from .thresholding import (threshold_adaptive, threshold_otsu, threshold_yen,
                            threshold_isodata)
 from . import rank
+from .rank import median
 
 from skimage._shared.utils import deprecated
 from skimage import restoration
@@ -30,6 +31,7 @@ __all__ = ['inverse',
            'wiener',
            'LPIFilter2D',
            'gaussian_filter',
+           'median',
            'canny',
            'sobel',
            'hsobel',
diff --git a/skimage/filters/tests/test_filter_import.py b/skimage/filters/tests/test_filter_import.py
index 90384324..764bda46 100644
--- a/skimage/filters/tests/test_filter_import.py
+++ b/skimage/filters/tests/test_filter_import.py
@@ -1,5 +1,6 @@
 from warnings import catch_warnings, simplefilter
 
+from skimage.filters import median
 
 def test_filter_import():
     with catch_warnings():

From b730777a74e196ce71ffa189ff7534e0ea54c7c2 Mon Sep 17 00:00:00 2001
From: emmanuelle <emmanuelle.gouillart@nsup.org>
Date: Sun, 30 Nov 2014 14:57:18 +0100
Subject: [PATCH 2/2] Modified test for median filter import

---
 skimage/filters/tests/test_filter_import.py | 1 -
 skimage/filters/tests/test_median.py        | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 skimage/filters/tests/test_median.py

diff --git a/skimage/filters/tests/test_filter_import.py b/skimage/filters/tests/test_filter_import.py
index 764bda46..90384324 100644
--- a/skimage/filters/tests/test_filter_import.py
+++ b/skimage/filters/tests/test_filter_import.py
@@ -1,6 +1,5 @@
 from warnings import catch_warnings, simplefilter
 
-from skimage.filters import median
 
 def test_filter_import():
     with catch_warnings():
diff --git a/skimage/filters/tests/test_median.py b/skimage/filters/tests/test_median.py
new file mode 100644
index 00000000..213c06ff
--- /dev/null
+++ b/skimage/filters/tests/test_median.py
@@ -0,0 +1,2 @@
+def test_median_in_filters():
+    from skimage.filters import median