Merge pull request matplotlib#19801 from anntzer/umftc

Expire deprecation of mathtext.fallback_to_cm.

Author: jklymak

doc/api/next_api_changes/removals/19801-AL.rst

@@ -0,0 +1,3 @@
+The ``mathtext.fallback_to_cm`` rcParams
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+... has been removed.  Use :rc:`mathtext.fallback` instead.

lib/matplotlib/__init__.py

@@ -552,7 +552,6 @@ def gen_candidates():
     'animation.avconv_path': ('3.3',),
     'animation.avconv_args': ('3.3',),
     'animation.html_args': ('3.3',),
-    'mathtext.fallback_to_cm': ('3.3',),
     'keymap.all_axes': ('3.3',),
     'savefig.jpeg_quality': ('3.3',),
     'text.latex.preview': ('3.3',),

lib/matplotlib/_mathtext.py

@@ -456,9 +456,6 @@ class UnicodeFonts(TruetypeFonts):
     def __init__(self, *args, **kwargs):
         # This must come first so the backend's owner is set correctly
         fallback_rc = mpl.rcParams['mathtext.fallback']
-        if mpl.rcParams['mathtext.fallback_to_cm'] is not None:
-            fallback_rc = ('cm' if mpl.rcParams['mathtext.fallback_to_cm']
-                           else None)
         font_cls = {'stix': StixFonts,
                     'stixsans': StixSansFonts,
                     'cm': BakomaFonts

lib/matplotlib/rcsetup.py

@@ -463,23 +463,6 @@ def validate_font_properties(s):
     return s
 
 
-def _validate_mathtext_fallback_to_cm(b):
-    """
-    Temporary validate for fallback_to_cm, while deprecated
-
-    """
-    if isinstance(b, str):
-        b = b.lower()
-    if b is None or b == 'none':
-        return None
-    else:
-        _api.warn_deprecated(
-            "3.3", message="Support for setting the 'mathtext.fallback_to_cm' "
-            "rcParam is deprecated since %(since)s and will be removed "
-            "%(removal)s; use 'mathtext.fallback : 'cm' instead.")
-        return validate_bool_maybe_none(b)
-
-
 def _validate_mathtext_fallback(s):
     _fallback_fonts = ['cm', 'stix', 'stixsans']
     if isinstance(s, str):
@@ -1119,7 +1102,6 @@ def _convert_validator_spec(key, conv):
                                 "stixsans", "custom"],
     "mathtext.default":        ["rm", "cal", "it", "tt", "sf", "bf", "default",
                                 "bb", "frak", "scr", "regular"],
-    "mathtext.fallback_to_cm": _validate_mathtext_fallback_to_cm,
     "mathtext.fallback":       _validate_mathtext_fallback,
 
     "image.aspect":          validate_aspect,  # equal, auto, a number
@@ -1440,7 +1422,6 @@ def _convert_validator_spec(key, conv):
     "animation.avconv_path": "avconv",
     "animation.avconv_args": [],
     "animation.html_args": [],
-    "mathtext.fallback_to_cm": None,
     "keymap.all_axes": ["a"],
     "savefig.jpeg_quality": 95,
     "text.latex.preview": False,

lib/matplotlib/tests/test_mathtext.py

@@ -337,12 +337,6 @@ def test_mathtext_fallback_invalid():
             mpl.rcParams['mathtext.fallback'] = fallback
 
 
-def test_mathtext_fallback_to_cm_invalid():
-    for fallback in [True, False]:
-        with pytest.warns(_api.MatplotlibDeprecationWarning):
-            mpl.rcParams['mathtext.fallback_to_cm'] = fallback
-
-
 @pytest.mark.parametrize(
     "fallback,fontlist",
     [("cm", ['DejaVu Sans', 'mpltest', 'STIXGeneral', 'cmr10', 'STIXGeneral']),