ENH/MNT: drop the rcparam from legend.title_fontsize

jklymak · jklymak · commit fcdf8c308fee · 2018-05-04T13:25:20.000-07:00
diff --git a/doc/users/next_whats_new/legend_title_fontsize_kwarg.rst b/doc/users/next_whats_new/legend_title_fontsize_kwarg.rst
@@ -1,9 +1,8 @@
-Legend now has a title_fontsize kwarg (and rcParam)
----------------------------------------------------
+Legend now has a title_fontsize kwarg
+-------------------------------------
 
 The title for a `.Figure.legend` and `.Axes.legend` can now have its
-fontsize set via the ``title_fontsize`` kwarg.  There is also a new
-:rc:`legend.title_fontsize`.  Both default to ``None``, which means
-the legend title will have the same fontsize as the axes default fontsize
-(*not* the legend fontsize, set by the ``fontsize`` kwarg or
-:rc:`legend.fontsize`).  
+fontsize set via the ``title_fontsize`` kwarg, defaults to ``None``, which
+means the legend title will have the same fontsize as the axes default
+fontsize (*not* the legend fontsize, set by the ``fontsize`` kwarg or
+:rc:`legend.fontsize`).
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -232,6 +232,9 @@ def _update_bbox_to_anchor(self, loc_in_canvas):
 title : str or None
     The legend's title. Default is no title (``None``).
 
+title_fontsize: str or None
+    The fontsize of the legend's title.  Default is the default fontsize.
+
 borderpad : float or None
     The fractional whitespace inside the legend border.
     Measured in font-size units.
@@ -540,9 +543,10 @@ def __init__(self, parent, handles, labels,
 
         self._loc = loc
         # figure out title fontsize:
-        if title_fontsize is None:
-            title_fontsize = rcParams['legend.title_fontsize']
-        tprop = FontProperties(size=title_fontsize)
+        if title_fontsize is not None:
+            tprop = FontProperties(size=title_fontsize)
+        else:
+            tprop = None
         self.set_title(title, prop=tprop)
         self._last_fontsize_points = self._fontsize
         self._draggable = None
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -420,13 +420,6 @@ def validate_aspect(s):
         raise ValueError('not a valid aspect specification')
 
 
-def validate_fontsize_None(s):
-    if s is None or s == 'None':
-        return None
-    else:
-        return validate_fontsize(s)
-
-
 def validate_fontsize(s):
     fontsizes = ['xx-small', 'x-small', 'small', 'medium', 'large',
                  'x-large', 'xx-large', 'smaller', 'larger']
@@ -1233,7 +1226,6 @@ def _validate_linestyle(ls):
     # the number of points in the legend line for scatter
     'legend.scatterpoints': [1, validate_int],
     'legend.fontsize': ['medium', validate_fontsize],
-    'legend.title_fontsize': [None, validate_fontsize_None],
      # the relative size of legend markers vs. original
     'legend.markerscale': [1.0, validate_float],
     'legend.shadow': [False, validate_bool],
diff --git a/matplotlibrc.template b/matplotlibrc.template
@@ -415,7 +415,6 @@ backend      : $TEMPLATE_BACKEND
 #legend.scatterpoints : 1        ## number of scatter points
 #legend.markerscale   : 1.0      ## the relative size of legend markers vs. original
 #legend.fontsize      : medium
-#legend.title_fontsize    : None ## None sets to the same as the default axes.  
 ## Dimensions as fraction of fontsize:
 #legend.borderpad     : 0.4      ## border whitespace
 #legend.labelspacing  : 0.5      ## the vertical space between the legend entries
