Merge pull request matplotlib#1764 from WeatherGod/mplot3d/set_title

dmcdougall · dmcdougall · commit dffac7a59d6f · 2013-03-22T22:12:19.000-07:00
Make loc come after fontdict in set_title. Closes matplotlib#1759
diff --git a/examples/mplot3d/lorenz_attractor.py b/examples/mplot3d/lorenz_attractor.py
@@ -44,6 +44,7 @@ def lorenz(x, y, z, s=10, r=28, b=2.667) :
 ax.set_xlabel("X Axis")
 ax.set_ylabel("Y Axis")
 ax.set_zlabel("Z Axis")
+ax.set_title("Lorenz Attractor")
 
 plt.show()
 
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -3184,7 +3184,7 @@ def get_title(self, loc="center"):
         return title.get_text()
 
     @docstring.dedent_interpd
-    def set_title(self, label, loc="center", fontdict=None, **kwargs):
+    def set_title(self, label, fontdict=None, loc="center", **kwargs):
         """Set a title for the axes.
 
         Set one of the three available axes titles. The available titles
@@ -3195,14 +3195,14 @@ def set_title(self, label, loc="center", fontdict=None, **kwargs):
         ----------
         label : str
             Text to use for the title
-        loc : {'center', 'left', 'right'}, str, optional
-            Which title to set, defaults to 'center'
         fontdict : dict
             A dictionary controlling the appearance of the title text,
             the default `fontdict` is:
             {'fontsize': rcParams['axes.titlesize'],
              'verticalalignment': 'baseline',
              'horizontalalignment': loc}
+        loc : {'center', 'left', 'right'}, str, optional
+            Which title to set, defaults to 'center'
 
         Returns
         -------
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -1186,7 +1186,7 @@ def box(on=None):
 
 def title(s, *args, **kwargs):
     """
-    title(label, loc='center', fontdict=None, **kwargs)
+    title(label, fontdict=None, loc='center', **kwargs)
 
     Set a title of the current axes.
 
@@ -1198,14 +1198,14 @@ def title(s, *args, **kwargs):
     ----------
     label : str
         Text to use for the title
-    loc : {'center', 'left', 'right'}, str, optional
-        Which title to set, defaults to 'center'
     fontdict : dict
         A dictionary controlling the appearance of the title text,
         the default `fontdict` is:
         {'fontsize': rcParams['axes.titlesize'],
          'verticalalignment': 'baseline',
          'horizontalalignment': loc}
+    loc : {'center', 'left', 'right'}, str, optional
+        Which title to set, defaults to 'center'
 
     Returns
     -------
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -2360,10 +2360,12 @@ def bar3d(self, x, y, z, dx, dy, dz, color='b',
 
         self.auto_scale_xyz((minx, maxx), (miny, maxy), (minz, maxz), had_data)
 
-    def set_title(self, label, fontdict=None, **kwargs):
-        Axes.set_title(self, label, fontdict, **kwargs)
+    def set_title(self, label, fontdict=None, loc='center', **kwargs):
+        ret = Axes.set_title(self, label, fontdict=fontdict, loc=loc, **kwargs)
         (x, y) = self.title.get_position()
         self.title.set_y(0.92 * y)
+        return ret
+    set_title.__doc__ = maxes.Axes.set_title.__doc__
 
 def get_test_data(delta=0.05):
     '''
