remove more YAArrow debris

efiring · efiring · commit 1e6af7710942 · 2015-07-19T09:31:50.000-10:00
diff --git a/lib/matplotlib/tests/test_text.py b/lib/matplotlib/tests/test_text.py
@@ -382,11 +382,11 @@ def test_text_with_arrow_annotation_get_window_extent():
     # bounding box of annotation (text + arrow)
     bbox = ann.get_window_extent(renderer=renderer)
     # bounding box of arrow
-    arrow_bbox = ann.arrow.get_window_extent(renderer)
+    arrow_bbox = ann.arrow_patch.get_window_extent(renderer)
     # bounding box of annotation text
     ann_txt_bbox = Text.get_window_extent(ann)
 
-    # make sure annotation with in 50 px wider than
+    # make sure annotation width is 50 px wider than
     # just the text
     eq_(bbox.width, text_bbox.width + 50.0)
     # make sure the annotation text bounding box is same size
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -21,7 +21,7 @@
 from matplotlib.cbook import is_string_like, maxdict
 from matplotlib import docstring
 from matplotlib.font_manager import FontProperties
-from matplotlib.patches import YAArrow, FancyBboxPatch
+from matplotlib.patches import FancyBboxPatch
 from matplotlib.patches import FancyArrowPatch, Rectangle
 import matplotlib.transforms as mtransforms
 from matplotlib.transforms import Affine2D, Bbox, Transform
@@ -531,7 +531,7 @@ def update_bbox_position_size(self, renderer):
             posx, posy = trans.transform_point((posx, posy))
 
             x_box, y_box, w_box, h_box = _get_textbox(self, renderer,
-                                                      with_descent=False)
+                                                      with_descent=True)
             self._bbox_patch.set_bounds(0., 0., w_box, h_box)
             theta = np.deg2rad(self.get_rotation())
             tr = mtransforms.Affine2D().rotate(theta)
@@ -548,7 +548,7 @@ def _draw_bbox(self, renderer, posx, posy):
         """
 
         x_box, y_box, w_box, h_box = _get_textbox(self, renderer,
-                                                  with_descent=False)
+                                                  with_descent=True)
         self._bbox_patch.set_bounds(0., 0., w_box, h_box)
         theta = np.deg2rad(self.get_rotation())
         tr = mtransforms.Affine2D().rotate(theta)
@@ -558,7 +558,6 @@ def _draw_bbox(self, renderer, posx, posy):
         self._bbox_patch.set_mutation_scale(fontsize_in_pixel)
         self._bbox_patch.draw(renderer)
 
-
     def _update_clip_properties(self):
         clipprops = dict(clip_box=self.clipbox,
                          clip_path=self._clippath,
@@ -2114,7 +2113,6 @@ def _update_position_xytext(self, renderer, xy_pixel):
         self.set_transform(self._get_xy_transform(
             renderer, self.xy, self.anncoords))
 
-
         ox0, oy0 = self._get_xy_display()
         ox1, oy1 = xy_pixel
 
@@ -2172,7 +2170,6 @@ def _update_position_xytext(self, renderer, xy_pixel):
                 self.arrow_patch.shrinkA = shrink_pts
                 self.arrow_patch.shrinkB = shrink_pts
 
-
             # adjust the starting point of the arrow relative to
             # the textbox.
             # TODO : Rotation needs to be accounted.
@@ -2243,7 +2240,6 @@ def draw(self, renderer):
         # Otherwise, a wedge arrowstyle can land partly on top of the Bbox.
         Text.draw(self, renderer)
 
-
     def get_window_extent(self, renderer=None):
         '''
         Return a :class:`~matplotlib.transforms.Bbox` object bounding
