FIX

jklymak · jklymak · commit 1a6da7bd9cf6 · 2020-04-04T18:17:02.000-07:00
diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -1863,25 +1863,49 @@ def axisinfo(self, unit, axis):
                               default_limits=(datemin, datemax))
 
 
+# The following is so that we can set the converter for dates
+# via the validator for the rcParams `date.converter` and
+# `date.interval_multiples`
 
-def register_converters():
-    """
-    Helper to register the date converters.
 
-    Useful to call if the :rc:`date.converter` or :rc:`date.interval_multiples`
-    change.
+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():
+    """
+    Helper to register the date converters when rcParams `date.converter` and
+    `date.interval_multiples` are changed.  Called by the helpers above.
     """
-    if matplotlib.rcParams['date.converter'] == 'concise':
+    global _conv_st
+    global _int_mult
+    if _conv_st == 'concise':
         converter = ConciseDateConverter
     else:
         converter = DateConverter
 
-    interval_multiples = matplotlib.rcParams['date.interval_multiples']
+    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)
 
-register_converters()
+# _register_converters()
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -154,6 +154,26 @@ def validate_bool_maybe_none(b):
         raise ValueError('Could not convert "%s" to bool' % b)
 
 
+def _validate_date_converter(s):
+    s = validate_string(s)
+    try:
+        import matplotlib.dates as mdates
+        mdates._set_converter(s)
+    except Exception as e:
+        pass
+
+
+def _validate_date_int_mult(s):
+    if s is None:
+        return
+    s = validate_bool(s)
+    try:
+        import matplotlib.dates as mdates
+        mdates._set_int_mult(s)
+    except Exception as e:
+        pass
+
+
 def _validate_tex_preamble(s):
     message = (
         f"Support for setting the 'text.latex.preamble' and 'pgf.preamble' "
@@ -1267,9 +1287,9 @@ def _convert_validator_spec(key, conv):
     'date.autoformatter.microsecond': ['%M:%S.%f', validate_string],
 
     # 'auto', 'concise', 'auto-noninterval'
-    'date.converter': ['auto', validate_string],
+    'date.converter': ['auto', _validate_date_converter],
     # for auto date locator, choose interval_multiples
-    'date.interval_multiples': [True, validate_bool],
+    'date.interval_multiples': [True, _validate_date_int_mult],
 
     #legend properties
     'legend.fancybox': [True, validate_bool],
