Merge pull request #5015 from spacelis/master

tacaswell · tacaswell · commit 485c04bb004e · 2015-08-31T21:25:16.000-04:00
FIX: fontdict parameter to set_xticklabels/set_yticklabels
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -2883,7 +2883,9 @@ def set_xticklabels(self, labels, fontdict=None, minor=False, **kwargs):
 
         ACCEPTS: sequence of strings
         """
-        ret = self.xaxis.set_ticklabels(labels, fontdict,
+        if fontdict is not None:
+            kwargs.update(fontdict)
+        ret = self.xaxis.set_ticklabels(labels,
                                         minor=minor, **kwargs)
         self.stale = True
         return ret
@@ -3143,7 +3145,9 @@ def set_yticklabels(self, labels, fontdict=None, minor=False, **kwargs):
 
         ACCEPTS: sequence of strings
         """
-        return self.yaxis.set_ticklabels(labels, fontdict,
+        if fontdict is not None:
+            kwargs.update(fontdict)
+        return self.yaxis.set_ticklabels(labels,
                                          minor=minor, **kwargs)
 
     def xaxis_date(self, tz=None):
