fixed some kwarg text processing bug

jdh2358 · jdh2358 · commit 565d614e1951 · 2004-12-23T17:05:07.000Z
svn path=/trunk/matplotlib/; revision=812
diff --git a/API_CHANGES b/API_CHANGES
@@ -1,11 +1,19 @@
+API CHANGES in matplotlib-0.65.1
+
+  removed add_axes and add_subplot from backend_bases.  Use
+  figure.add_axes and add_subplot instead.  The figure now manages the
+  current axes with gca and sca for get and set current axe.  If you
+  have code you are porting which called, eg, figmanager.add_axes, you
+  can now simply do figmanager.canvas.figure.add_axes.
+
 API CHANGES in matplotlib-0.65
 
-mpl_connect and mpl_disconnect in the matlab interface renamed to
-connect and disconnect
+  mpl_connect and mpl_disconnect in the matlab interface renamed to
+  connect and disconnect
 
-Did away with the text methods for angle since they were ambiguous.
-fontangle could mean fontstyle (obligue, etc) or the rotation of the
-text.  Use style and rotation instead.
+  Did away with the text methods for angle since they were ambiguous.
+  fontangle could mean fontstyle (obligue, etc) or the rotation of the
+  text.  Use style and rotation instead.
 
 
 API CHANGES in matplotlib-0.63
diff --git a/TODO b/TODO
@@ -612,7 +612,6 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 
 -- DONE add hold option to plot
 
-
 -- fix linestyle for collections
 
 -- update ticklabels and range for colorbar when clim changes
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -2486,15 +2486,16 @@ def set_title(self, label, fontdict=None, **kwargs):
 
 ACCEPTS: str
         """
-        override = {
+        default = {
             'fontsize':rcParams['axes.titlesize'],
             'verticalalignment' : 'bottom',
-            'horizontalalignment' : 'left'
+            'horizontalalignment' : 'center'
             }
 
         self.title.set_text(label)
-        override = _process_text_args({}, fontdict, **kwargs)
-        self.title.update(override)
+        self.title.update(default)
+        if fontdict is not None: self.title.update(fontdict)
+        self.title.update(kwargs)
         return self.title
 
 
@@ -2510,8 +2511,8 @@ def set_xlabel(self, xlabel, fontdict=None, **kwargs):
 
         label = self.xaxis.get_label()
         label.set_text(xlabel)
-        override = _process_text_args({}, fontdict, **kwargs)
-        label.update(override)
+        if fontdict is not None: label.update(fontdict)
+        label.update(kwargs)
         return label
 
     def _send_xlim_event(self):
@@ -2591,22 +2592,16 @@ def set_ylabel(self, ylabel, fontdict=None, **kwargs):
 
 Set the label for the yaxis
 
-Defaults override is
-
-  override = {
-     'verticalalignment'   : 'center',
-     'horizontalalignment' : 'right',
-     'rotation'='vertical' : }
-
 See the text doctstring for information of how override and
 the optional args work
 
 ACCEPTS: str
         """
         label = self.yaxis.get_label()
         label.set_text(ylabel)
-        override = _process_text_args({}, fontdict, **kwargs)
-        label.update(override)
+    
+        if fontdict is not None: self.title.update(label)
+        label.update(kwargs)
         return label
 
     def set_ylim(self, v, emit=True):
@@ -2885,20 +2880,21 @@ def text(self, x, y, s, fontdict=None, **kwargs):
                 
 
         """
-        override = {
+        default = {
             'verticalalignment' : 'bottom',
             'horizontalalignment' : 'left',
             #'verticalalignment' : 'top',            
             'transform' : self.transData,
             }
 
-        override = _process_text_args(override, fontdict, **kwargs)
         t = Text(
             x=x, y=y, text=s,
             )
         self._set_artist_props(t)
 
-        t.update(override)
+        t.update(default)
+        if fontdict is not None: t.update(fontdict)
+        t.update(kwargs)
         self.texts.append(t)
 
         if t.get_clip_on():  t.set_clip_box(self.bbox)
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -700,13 +700,10 @@ def set_ticklabels(self, ticklabels, *args, **kwargs):
         self.set_major_formatter( FixedFormatter(ticklabels) )
 
     
-        override = {}
-        override = _process_text_args(override, *args, **kwargs)
-
         ret = []
         for i, tick in enumerate(self.get_major_ticks()):
             if i<len(ticklabels): ret.append(tick.label1)
-            tick.label1.update(override)
+            tick.label1.update(kwargs)
         return ret
     
     def set_ticks(self, ticks):
