Remove deprecated rcParam accepted values.

Author: QuLogic

doc/api/next_api_changes/removals/19901-ES.rst

@@ -9,3 +9,14 @@ The following validators, defined in `.rcsetup`, have been removed:
 ``validate_nseq_float``, ``validate_nseq_int``, ``validate_orientation``,
 ``validate_pgf_texsystem``, ``validate_ps_papersize``,
 ``validate_svg_fontset``, ``validate_toolbar``, ``validate_webagg_address``.
+
+Stricter rcParam validation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+:rc:`axes.axisbelow` no longer accepts strings starting with "line"
+(case-insensitive) as "line"; use "line" (case-sensitive) instead.
+
+The :rc:`text.latex.preamble` and :rc:`pdf.preamble` no longer accept
+non-string values.
+
+All ``*.linestyle`` rcParams no longer accept ``offset = None``; set the offset
+to 0 instead.

lib/matplotlib/rcsetup.py

@@ -166,42 +166,13 @@ def _validate_date_int_mult(s):
     mdates._rcParam_helper.set_int_mult(s)
 
 
-def _validate_tex_preamble(s):
-    if s is None or s == 'None':
-        _api.warn_deprecated(
-            "3.3", message="Support for setting the 'text.latex.preamble' or "
-            "'pgf.preamble' rcParam to None is deprecated since %(since)s and "
-            "will be removed %(removal)s; set it to an empty string instead.")
-        return ""
-    try:
-        if isinstance(s, str):
-            return s
-        elif np.iterable(s):
-            _api.warn_deprecated(
-                "3.3", message="Support for setting the 'text.latex.preamble' "
-                "or 'pgf.preamble' rcParam to a list of strings is deprecated "
-                "since %(since)s and will be removed %(removal)s; set it to a "
-                "single string instead.")
-            return '\n'.join(s)
-        else:
-            raise TypeError
-    except TypeError as e:
-        raise ValueError('Could not convert "%s" to string' % s) from e
-
-
 def validate_axisbelow(s):
     try:
         return validate_bool(s)
     except ValueError:
         if isinstance(s, str):
             if s == 'line':
                 return 'line'
-            if s.lower().startswith('line'):
-                _api.warn_deprecated(
-                    "3.3", message=f"Support for setting axes.axisbelow to "
-                    f"{s!r} to mean 'line' is deprecated since %(since)s and "
-                    f"will be removed %(removal)s; set it to 'line' instead.")
-                return 'line'
     raise ValueError('%s cannot be interpreted as'
                      ' True, False, or "line"' % s)
 
@@ -466,25 +437,20 @@ def _is_iterable_not_string_like(x):
         # nonsensically interpreted as sequences of numbers (codepoints).
         return np.iterable(x) and not isinstance(x, (str, bytes, bytearray))
 
-    # (offset, (on, off, on, off, ...))
-    if (_is_iterable_not_string_like(ls)
-            and len(ls) == 2
-            and isinstance(ls[0], (type(None), Number))
-            and _is_iterable_not_string_like(ls[1])
-            and len(ls[1]) % 2 == 0
-            and all(isinstance(elem, Number) for elem in ls[1])):
-        if ls[0] is None:
-            _api.warn_deprecated(
-                "3.3", message="Passing the dash offset as None is deprecated "
-                "since %(since)s and support for it will be removed "
-                "%(removal)s; pass it as zero instead.")
-            ls = (0, ls[1])
-        return ls
-    # For backcompat: (on, off, on, off, ...); the offset is implicitly None.
-    if (_is_iterable_not_string_like(ls)
-            and len(ls) % 2 == 0
-            and all(isinstance(elem, Number) for elem in ls)):
-        return (0, ls)
+    if _is_iterable_not_string_like(ls):
+        if len(ls) == 2 and _is_iterable_not_string_like(ls[1]):
+            # (offset, (on, off, on, off, ...))
+            offset, onoff = ls
+        else:
+            # For backcompat: (on, off, on, off, ...); the offset is implicit.
+            offset = 0
+            onoff = ls
+
+        if (isinstance(offset, Number)
+                and len(onoff) % 2 == 0
+                and all(isinstance(elem, Number) for elem in onoff)):
+            return (offset, onoff)
+
     raise ValueError(f"linestyle {ls!r} is not a valid on-off ink sequence.")
 
 
@@ -927,7 +893,7 @@ def _convert_validator_spec(key, conv):
     # text props
     "text.color":          validate_color,
     "text.usetex":         validate_bool,
-    "text.latex.preamble": _validate_tex_preamble,
+    "text.latex.preamble": validate_string,
     "text.hinting":        ["default", "no_autohint", "force_autohint",
                             "no_hinting", "auto", "native", "either", "none"],
     "text.hinting_factor": validate_int,
@@ -1187,7 +1153,7 @@ def _convert_validator_spec(key, conv):
 
     "pgf.texsystem": ["xelatex", "lualatex", "pdflatex"],  # latex variant used
     "pgf.rcfonts":   validate_bool,  # use mpl's rc settings for font config
-    "pgf.preamble":  _validate_tex_preamble,  # custom LaTeX preamble
+    "pgf.preamble":  validate_string,  # custom LaTeX preamble
 
     # write raster image data into the svg file
     "svg.image_inline": validate_bool,

lib/matplotlib/tests/test_rcparams.py

@@ -390,6 +390,7 @@ def generate_validator_testcases(valid):
                   ([1, 2, 3], ValueError),  # sequence with odd length
                   (1.23, ValueError),  # not a sequence
                   (("a", [1, 2]), ValueError),  # wrong explicit offset
+                  ((None, [1, 2]), ValueError),  # wrong explicit offset
                   ((1, [1, 2, 3]), ValueError),  # odd length sequence
                   (([1, 2], 1), ValueError),  # inverted offset/onoff
                   )