Merge remote-tracking branch 'upstream/v1.3.x'

mdboom · mdboom · commit b177aafb9a9f · 2013-12-02T10:59:45.000-05:00
Conflicts:
	lib/matplotlib/axis.py
	lib/matplotlib/tests/test_axes.py
diff --git a/examples/mplot3d/wire3d_animation_demo.py b/examples/mplot3d/wire3d_animation_demo.py
@@ -33,6 +33,6 @@ def generate(X, Y, phi):
     if oldcol is not None:
         ax.collections.remove(oldcol)
 
-    plt.draw()
+    plt.pause(.001)
 
 print ('FPS: %f' % (100 / (time.time() - tstart)))
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -316,6 +316,10 @@ def _apply_params(self, **kw):
             self.label1.set(**label_kw)
             self.label2.set(**label_kw)
             for k, v in six.iteritems(label_kw):
+                # for labelsize the text objects covert str ('small')
+                # -> points. grab the integer from the `Text` object
+                # instead of saving the string representation
+                v = getattr(self.label1, 'get_' + k)()
                 setattr(self, '_' + k, v)
 
 
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -2450,6 +2450,16 @@ def test_relim_visible_only():
     assert ax.get_ylim() == y1
 
 
+def test_text_labelsize():
+    """
+    tests for issue #1172
+    """
+    fig = plt.figure()
+    ax = fig.gca()
+    ax.tick_params(labelsize='large')
+    ax.tick_params(direction='out')
+
+
 if __name__ == '__main__':
     import nose
     import sys
