TST: move from decorator to fixture

tacaswell · tacaswell · commit d31ec5fb230c · 2017-12-31T18:43:47.000-05:00
diff --git a/lib/matplotlib/testing/conftest.py b/lib/matplotlib/testing/conftest.py
@@ -76,3 +76,26 @@ def mpl_image_comparison_parameters(request, extension):
         yield
     finally:
         delattr(func.__wrapped__, 'parameters')
+
+
+@pytest.fixture
+def pd(request):
+    '''fixture to import and configure pandas'''
+
+    pd = pytest.importorskip('pandas')
+    if pd:
+        try:
+            from pandas.plotting import (
+                register_matplotlib_converters as register)
+        except ImportError:
+            from pandas.tseries.converter import register
+        register()
+
+        try:
+            from pandas.plotting import (
+                deregister_matplotlib_converters as deregister)
+            request.addfinalizer(deregister)
+        except ImportError:
+            pass
+
+    return pd
diff --git a/lib/matplotlib/tests/conftest.py b/lib/matplotlib/tests/conftest.py
@@ -2,4 +2,5 @@
 
 from matplotlib.testing.conftest import (mpl_test_settings,
                                          mpl_image_comparison_parameters,
-                                         pytest_configure, pytest_unconfigure)
+                                         pytest_configure, pytest_unconfigure,
+                                         pd)
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -5091,27 +5091,7 @@ def test_broken_barh_empty():
     ax.broken_barh([], (.1, .5))
 
 
-def _pandas_wrapper(func):
-    '''Decorator to centralize pandas setup / conditional import'''
-    import functools
-
-    @functools.wraps(func)
-    def wrapped_for_pandas(*args, **kwargs):
-        pytest.importorskip('pandas')
-        try:
-            from pandas.plotting import (
-                register_matplotlib_converters as register)
-        except ImportError:
-            from pandas.tseries.converter import register
-        register()
-        return func(*args, **kwargs)
-
-    return wrapped_for_pandas
-
-
-@_pandas_wrapper
-def test_pandas_pcolormesh():
-    import pandas as pd
+def test_pandas_pcolormesh(pd):
     time = pd.date_range('2000-01-01', periods=10)
     depth = np.arange(20)
     data = np.random.rand(20, 10)
@@ -5120,10 +5100,7 @@ def test_pandas_pcolormesh():
     ax.pcolormesh(time, depth, data)
 
 
-@_pandas_wrapper
-def test_pandas_indexing_dates():
-    import pandas as pd
-
+def test_pandas_indexing_dates(pd):
     dates = np.arange('2005-02', '2005-03', dtype='datetime64[D]')
     values = np.sin(np.array(range(len(dates))))
     df = pd.DataFrame({'dates': dates, 'values': values})
@@ -5134,32 +5111,23 @@ def test_pandas_indexing_dates():
     ax.plot('dates', 'values', data=without_zero_index)
 
 
-@_pandas_wrapper
-def test_pandas_errorbar_indexing():
-    import pandas as pd
-
+def test_pandas_errorbar_indexing(pd):
     df = pd.DataFrame(np.random.uniform(size=(5, 4)),
                       columns=['x', 'y', 'xe', 'ye'],
                       index=[1, 2, 3, 4, 5])
     fig, ax = plt.subplots()
     ax.errorbar('x', 'y', xerr='xe', yerr='ye', data=df)
 
 
-@_pandas_wrapper
-def test_pandas_indexing_hist():
-    import pandas as pd
-
+def test_pandas_indexing_hist(pd):
     ser_1 = pd.Series(data=[1, 2, 2, 3, 3, 4, 4, 4, 4, 5])
     ser_2 = ser_1.iloc[1:]
     fig, axes = plt.subplots()
     axes.hist(ser_2)
 
 
-@_pandas_wrapper
-def test_pandas_bar_align_center():
+def test_pandas_bar_align_center(pd):
     # Tests fix for issue 8767
-    import pandas as pd
-
     df = pd.DataFrame({'a': range(2), 'b': range(2)})
 
     fig, ax = plt.subplots(1)
