TST: add a test

jklymak · jklymak · commit 54460f510795 · 2020-06-19T14:47:11.000-07:00
diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -1915,45 +1915,42 @@ def axisinfo(self, unit, axis):
 # via the validator for the rcParams `date.converter` and
 # `date.interval_multiples`
 
-
-global _converter
-_conv_st = 'auto'
-global _int_mult
-_int_mult = True
-
-
-def _set_converter(s):
-    """Called by validator for rcParams date.converter"""
-    global _conv_st
-    _conv_st = s
-    _register_converters()
-
-
-def _set_int_mult(b):
-    """Called by validator for rcParams date.interval_multiples"""
-    global _int_mult
-    _int_mult = b
-    _register_converters()
-
-
-def _register_converters():
+class _rcParam_helper:
     """
-    Helper to register the date converters when rcParams `date.converter` and
-    `date.interval_multiples` are changed.  Called by the helpers above.
+    Never instatiated, but manages the rcParams for dates...
     """
-    global _conv_st
-    global _int_mult
-    if _conv_st == 'concise':
-        converter = ConciseDateConverter
-    else:
-        converter = DateConverter
 
-    interval_multiples = _int_mult
-    units.registry[np.datetime64] = converter(
-            interval_multiples=interval_multiples)
-    units.registry[datetime.date] = converter(
-            interval_multiples=interval_multiples)
-    units.registry[datetime.datetime] = converter(
-            interval_multiples=interval_multiples)
+    conv_st = 'auto'
+    int_mult = True
+
+    @classmethod
+    def set_converter(cls, s):
+        """Called by validator for rcParams date.converter"""
+        cls.conv_st = s
+        cls.register_converters()
+
+    @classmethod
+    def set_int_mult(cls, b):
+        """Called by validator for rcParams date.interval_multiples"""
+        cls.int_mult = b
+        cls.register_converters()
 
-# _register_converters()
+    @classmethod
+    def register_converters(cls):
+        """
+        Helper to register the date converters when rcParams `date.converter` and
+        `date.interval_multiples` are changed.  Called by the helpers above.
+        """
+        if cls.conv_st == 'concise':
+            converter = ConciseDateConverter
+        else:
+            converter = DateConverter
+
+        interval_multiples = cls.int_mult
+        print(interval_multiples)
+        units.registry[np.datetime64] = converter(
+                interval_multiples=interval_multiples)
+        units.registry[datetime.date] = converter(
+                interval_multiples=interval_multiples)
+        units.registry[datetime.datetime] = converter(
+                interval_multiples=interval_multiples)
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -178,7 +178,7 @@ def _validate_date_converter(s):
     s = validate_string(s)
     try:
         import matplotlib.dates as mdates
-        mdates._set_converter(s)
+        mdates._rcParam_helper.set_converter(s)
     except Exception as e:
         pass
 
@@ -189,7 +189,7 @@ def _validate_date_int_mult(s):
     s = validate_bool(s)
     try:
         import matplotlib.dates as mdates
-        mdates._set_int_mult(s)
+        mdates._rcParam_helper.set_int_mult(s)
     except Exception as e:
         pass
 
diff --git a/lib/matplotlib/tests/test_dates.py b/lib/matplotlib/tests/test_dates.py
@@ -947,3 +947,43 @@ def test_change_epoch():
     np.testing.assert_allclose(
         mdates.date2num(np.datetime64('1970-01-01T12:00:00')),
         0.5)
+
+
+def test_change_converter():
+
+    plt.rcParams['date.converter'] = 'concise'
+    dates = np.arange('2020-01-01', '2020-05-01', dtype='datetime64[D]')
+    fig, ax = plt.subplots()
+
+    ax.plot(dates, np.arange(len(dates)))
+    fig.canvas.draw()
+    assert ax.get_xticklabels()[0].get_text() == 'Jan'
+    assert ax.get_xticklabels()[1].get_text() == '15'
+
+    plt.rcParams['date.converter'] = 'auto'
+    fig, ax = plt.subplots()
+
+    ax.plot(dates, np.arange(len(dates)))
+    fig.canvas.draw()
+    assert ax.get_xticklabels()[0].get_text() == 'Jan 01 2020'
+    assert ax.get_xticklabels()[1].get_text() == 'Jan 15 2020'
+
+
+def test_change_interval_multiples():
+
+    plt.rcParams['date.interval_multiples'] = False
+    dates = np.arange('2020-01-10', '2020-05-01', dtype='datetime64[D]')
+    fig, ax = plt.subplots()
+
+    ax.plot(dates, np.arange(len(dates)))
+    fig.canvas.draw()
+    assert ax.get_xticklabels()[0].get_text() == 'Jan 10 2020'
+    assert ax.get_xticklabels()[1].get_text() == 'Jan 24 2020'
+
+    plt.rcParams['date.interval_multiples'] = 'True'
+    fig, ax = plt.subplots()
+
+    ax.plot(dates, np.arange(len(dates)))
+    fig.canvas.draw()
+    assert ax.get_xticklabels()[0].get_text() == 'Jan 15 2020'
+    assert ax.get_xticklabels()[1].get_text() == 'Feb 01 2020'
