Merge pull request #14345 from anntzer/importorskip

timhoffm · web-flow · commit 4e5d83e954d3 · 2019-05-27T21:49:29.000+02:00
Use importorskip for tests depending on pytz.
diff --git a/lib/matplotlib/tests/test_dates.py b/lib/matplotlib/tests/test_dates.py
@@ -15,14 +15,6 @@
 from matplotlib import rc_context
 
 
-def __has_pytz():
-    try:
-        import pytz
-        return True
-    except ImportError:
-        return False
-
-
 def test_date_numpyx():
     # test that numpy dates work properly...
     base = datetime.datetime(2017, 1, 1)
@@ -710,10 +702,9 @@ def attach_tz(dt, zi):
 
 
 @pytest.mark.pytz
-@pytest.mark.skipif(not __has_pytz(), reason="Requires pytz")
 def test_rrulewrapper_pytz():
     # Test to make sure pytz zones are supported in rrules
-    import pytz
+    pytz = pytest.importorskip("pytz")
 
     def attach_tz(dt, zi):
         return zi.localize(dt)
@@ -722,9 +713,8 @@ def attach_tz(dt, zi):
 
 
 @pytest.mark.pytz
-@pytest.mark.skipif(not __has_pytz(), reason="Requires pytz")
 def test_yearlocator_pytz():
-    import pytz
+    pytz = pytest.importorskip("pytz")
 
     tz = pytz.timezone('America/New_York')
     x = [tz.localize(datetime.datetime(2010, 1, 1))
