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

mdboom · mdboom · commit 23c9734dcd1d · 2013-05-13T12:18:19.000-04:00
Conflicts:
	lib/matplotlib/axes.py
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -3354,6 +3354,7 @@ def text(self, x, y, s, fontdict=None,
             'verticalalignment': 'baseline',
             'horizontalalignment': 'left',
             'transform': self.transData,
+            'clip_on': False
             }
 
         # At some point if we feel confident that TextWithDash
@@ -3377,9 +3378,7 @@ def text(self, x, y, s, fontdict=None,
         self.texts.append(t)
         t._remove_method = lambda h: self.texts.remove(h)
 
-        #if t.get_clip_on():  t.set_clip_box(self.bbox)
-        if 'clip_on' in kwargs:
-            t.set_clip_box(self.bbox)
+        t.set_clip_path(self.patch)
         return t
 
     @docstring.dedent_interpd
