FIX: ensure that used sub-packages are actually imported

tacaswell · tacaswell · commit b512c703f538 · 2022-01-24T16:31:29.000-05:00
closes #22305
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -44,7 +44,7 @@
     from dummy_threading import Timer
 
 import matplotlib as mpl
-from matplotlib import _api, _afm, cbook, ft2font, rcParams
+from matplotlib import _api, _afm, cbook, ft2font
 from matplotlib._fontconfig_pattern import (
     parse_fontconfig_pattern, generate_fontconfig_pattern)
 from matplotlib.rcsetup import _validators
@@ -682,6 +682,7 @@ def __init__(self, family=None, style=None, variant=None, weight=None,
                  stretch=None, size=None,
                  fname=None,  # if set, it's a hardcoded filename to use
                  math_fontfamily=None):
+        rcParams = mpl.rcParams
         self._family = _normalize_font_family(rcParams['font.family'])
         self._slant = rcParams['font.style']
         self._variant = rcParams['font.variant']
@@ -823,7 +824,7 @@ def set_family(self, family):
         :rc:`text.usetex` is `True`.
         """
         if family is None:
-            family = rcParams['font.family']
+            family = mpl.rcParams['font.family']
         self._family = _normalize_font_family(family)
     set_name = set_family
 
@@ -832,7 +833,7 @@ def set_style(self, style):
         Set the font style.  Values are: 'normal', 'italic' or 'oblique'.
         """
         if style is None:
-            style = rcParams['font.style']
+            style = mpl.rcParams['font.style']
         _api.check_in_list(['normal', 'italic', 'oblique'], style=style)
         self._slant = style
     set_slant = set_style
@@ -842,7 +843,7 @@ def set_variant(self, variant):
         Set the font variant.  Values are: 'normal' or 'small-caps'.
         """
         if variant is None:
-            variant = rcParams['font.variant']
+            variant = mpl.rcParams['font.variant']
         _api.check_in_list(['normal', 'small-caps'], variant=variant)
         self._variant = variant
 
@@ -854,7 +855,7 @@ def set_weight(self, weight):
         'demi', 'bold', 'heavy', 'extra bold', 'black'
         """
         if weight is None:
-            weight = rcParams['font.weight']
+            weight = mpl.rcParams['font.weight']
         try:
             weight = int(weight)
             if weight < 0 or weight > 1000:
@@ -872,7 +873,7 @@ def set_stretch(self, stretch):
         'ultra-expanded', or a numeric value in the range 0-1000.
         """
         if stretch is None:
-            stretch = rcParams['font.stretch']
+            stretch = mpl.rcParams['font.stretch']
         try:
             stretch = int(stretch)
             if stretch < 0 or stretch > 1000:
@@ -889,7 +890,7 @@ def set_size(self, size):
         or an absolute font size, e.g., 12.
         """
         if size is None:
-            size = rcParams['font.size']
+            size = mpl.rcParams['font.size']
         try:
             size = float(size)
         except ValueError:
@@ -955,7 +956,7 @@ def set_math_fontfamily(self, fontfamily):
         .text.Text.get_math_fontfamily
         """
         if fontfamily is None:
-            fontfamily = rcParams['mathtext.fontset']
+            fontfamily = mpl.rcParams['mathtext.fontset']
         else:
             valid_fonts = _validators['mathtext.fontset'].valid.values()
             # _check_in_list() Validates the parameter math_fontfamily as
@@ -1133,7 +1134,7 @@ def get_default_size():
         """
         Return the default font size.
         """
-        return rcParams['font.size']
+        return mpl.rcParams['font.size']
 
     def set_default_weight(self, weight):
         """
@@ -1145,7 +1146,7 @@ def set_default_weight(self, weight):
     def _expand_aliases(family):
         if family in ('sans', 'sans serif'):
             family = 'sans-serif'
-        return rcParams['font.' + family]
+        return mpl.rcParams['font.' + family]
 
     # Each of the scoring functions below should return a value between
     # 0.0 (perfect match) and 1.0 (terrible match)
@@ -1323,7 +1324,7 @@ def findfont(self, prop, fontext='ttf', directory=None,
         # Pass the relevant rcParams (and the font manager, as `self`) to
         # _findfont_cached so to prevent using a stale cache entry after an
         # rcParam was changed.
-        rc_params = tuple(tuple(rcParams[key]) for key in [
+        rc_params = tuple(tuple(mpl.rcParams[key]) for key in [
             "font.serif", "font.sans-serif", "font.cursive", "font.fantasy",
             "font.monospace"])
         return self._findfont_cached(
@@ -1446,10 +1447,10 @@ def get_font(filename, hinting_factor=None):
     # single font is selected using two different relative paths.
     filename = _cached_realpath(filename)
     if hinting_factor is None:
-        hinting_factor = rcParams['text.hinting_factor']
+        hinting_factor = mpl.rcParams['text.hinting_factor']
     # also key on the thread ID to prevent segfaults with multi-threading
     return _get_font(filename, hinting_factor,
-                     _kerning_factor=rcParams['text.kerning_factor'],
+                     _kerning_factor=mpl.rcParams['text.kerning_factor'],
                      thread_id=threading.get_ident())
 
 
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -134,6 +134,7 @@
 import matplotlib as mpl
 from matplotlib import _api, cbook
 from matplotlib import transforms as mtransforms
+import matplotlib.font_manager as mfont_manager
 
 _log = logging.getLogger(__name__)
 
@@ -441,8 +442,8 @@ def __init__(self, useOffset=None, useMathText=None, useLocale=None):
             useMathText = mpl.rcParams['axes.formatter.use_mathtext']
             if useMathText is False:
                 try:
-                    ufont = mpl.font_manager.findfont(
-                        mpl.font_manager.FontProperties(
+                    ufont = mfont_manager.findfont(
+                        mfont_manager.FontProperties(
                             mpl.rcParams["font.family"]
                         ),
                         fallback_to_default=False,
