rebase with origin/master (up to date with upstream/master)

rmorshea · rmorshea · commit e764f37ef806 · 2015-08-02T14:25:27.000-07:00
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -2225,7 +2225,7 @@ def _update_position_xytext(self, renderer, xy_pixel):
                                   width=w,
                                   height=h,
                                   )
-                    r.set_transform(mtransforms.IdentityTransform())
+                    r.transform = mtransforms.IdentityTransform()
                     r.set_clip_on(False)
 
                     self.arrow_patch.set_patchA(r)
diff --git a/lib/matplotlib/traitlets.py b/lib/matplotlib/traitlets.py
@@ -15,8 +15,8 @@
                             Dict, List, Instance, Union, Unicode,
                             Tuple, TraitError, Undefined, getargspec)
 
+import re
 import numpy as np
-
 from types import MethodType
 from .transforms import IdentityTransform, Transform
 

Original file line number	Diff line number	Diff line change
`@@ -2225,7 +2225,7 @@ def _update_position_xytext(self, renderer, xy_pixel):`
`2225`	`2225`	`width=w,`
`2226`	`2226`	`height=h,`
`2227`	`2227`	`)`
`2228`		`- r.set_transform(mtransforms.IdentityTransform())`
	`2228`	`+ r.transform = mtransforms.IdentityTransform()`
`2229`	`2229`	`r.set_clip_on(False)`
`2230`	`2230`
`2231`	`2231`	`self.arrow_patch.set_patchA(r)`