Simplify handling of fontproperties=None.

anntzer · anntzer · commit 4eda3f2197e9 · 2020-05-22T19:46:04.000+02:00
... by moving support for it (building a default FontProperties()) to
the generic constructor `FontProperties._from_any`.
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -638,8 +638,20 @@ def __init__(self,
 
     @classmethod
     def _from_any(cls, arg):
+        """
+        Generic constructor which can build a `.FontProperties` from any of the
+        following:
+
+        - a `.FontProperties`: it is passed through as is;
+        - `None`: a `.FontProperties` using rc values is used;
+        - an `os.PathLike`: it is used as path to the font file;
+        - a `str`: it is parsed as a fontconfig pattern;
+        - a `dict`: it is passed as ``**kwargs`` to `.FontProperties`.
+        """
         if isinstance(arg, cls):
             return arg
+        elif arg is None:
+            return cls()
         elif isinstance(arg, os.PathLike):
             return cls(fname=arg)
         elif isinstance(arg, str):
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -147,15 +147,9 @@ def __init__(self,
         """
         Artist.__init__(self)
         self._x, self._y = x, y
-
-        if color is None:
-            color = rcParams['text.color']
-        if fontproperties is None:
-            fontproperties = FontProperties()
-
         self._text = ''
         self.set_text(text)
-        self.set_color(color)
+        self.set_color(color if color is not None else rcParams["text.color"])
         self.set_fontproperties(fontproperties)
         self.set_usetex(usetex)
         self.set_wrap(wrap)
diff --git a/lib/matplotlib/textpath.py b/lib/matplotlib/textpath.py
@@ -385,10 +385,7 @@ def __init__(self, xy, s, size=None, prop=None,
         # Circular import.
         from matplotlib.text import Text
 
-        if prop is None:
-            prop = FontProperties()
-        else:
-            prop = FontProperties._from_any(prop)
+        prop = FontProperties._from_any(prop)
         if size is None:
             size = prop.get_size_in_points()
 
