MNT: Clean up skew test

dopplershift · dopplershift · commit 42d50978f7b3 · 2016-11-17T11:09:34.000-07:00
Make it match the refactoring on the example.
diff --git a/lib/matplotlib/tests/test_skew.py b/lib/matplotlib/tests/test_skew.py
@@ -5,18 +5,14 @@
                         unicode_literals)
 
 import itertools
-import six
 
-from nose.tools import assert_true
-import numpy as np
 import matplotlib.pyplot as plt
-from matplotlib.testing.decorators import cleanup, image_comparison
+from matplotlib.testing.decorators import image_comparison
 
 from matplotlib.axes import Axes
 import matplotlib.transforms as transforms
 import matplotlib.axis as maxis
 import matplotlib.spines as mspines
-import matplotlib.path as mpath
 import matplotlib.patches as mpatch
 from matplotlib.projections import register_projection
 
@@ -54,46 +50,31 @@ def draw(self, renderer):
 # This class exists to provide two separate sets of intervals to the tick,
 # as well as create instances of the custom tick
 class SkewXAxis(maxis.XAxis):
-    def __init__(self, *args, **kwargs):
-        maxis.XAxis.__init__(self, *args, **kwargs)
-        self.upper_interval = 0.0, 1.0
-
     def _get_tick(self, major):
         return SkewXTick(self.axes, 0, '', major=major)
 
     @property
     def lower_interval(self):
         return self.axes.viewLim.intervalx
 
+    @property
+    def upper_interval(self):
+        return self.axes.upper_xlim
+
     def get_view_interval(self):
-        return self.upper_interval[0], self.axes.viewLim.intervalx[1]
+        return self.upper_interval[0], self.lower_interval[1]
 
 
 # This class exists to calculate the separate data range of the
 # upper X-axis and draw the spine there. It also provides this range
 # to the X-axis artist for ticking and gridlines
 class SkewSpine(mspines.Spine):
-    def __init__(self, axes, spine_type):
-        if spine_type == 'bottom':
-            loc = 0.0
-        else:
-            loc = 1.0
-        mspines.Spine.__init__(self, axes, spine_type,
-                               mpath.Path([(13, loc), (13, loc)]))
-
     def _adjust_location(self):
-        trans = self.axes.transDataToAxes.inverted()
+        pts = self._path.vertices
         if self.spine_type == 'top':
-            yloc = 1.0
+            pts[:, 0] = self.axis.upper_interval
         else:
-            yloc = 0.0
-        left = trans.transform_point((0.0, yloc))[0]
-        right = trans.transform_point((1.0, yloc))[0]
-
-        pts = self._path.vertices
-        pts[0, 0] = left
-        pts[1, 0] = right
-        self.axis.upper_interval = (left, right)
+            pts[:, 0] = self.axis.lower_interval
 
 
 # This class handles registration of the skew-xaxes as a projection as well
@@ -106,7 +87,7 @@ class SkewXAxes(Axes):
     name = 'skewx'
 
     def _init_axis(self):
-        #Taken from Axes and modified to use our modified X-axis
+        # Taken from Axes and modified to use our modified X-axis
         self.xaxis = SkewXAxis(self)
         self.spines['top'].register_axis(self.xaxis)
         self.spines['bottom'].register_axis(self.xaxis)
@@ -115,7 +96,7 @@ def _init_axis(self):
         self.spines['right'].register_axis(self.yaxis)
 
     def _gen_axes_spines(self):
-        spines = {'top': SkewSpine(self, 'top'),
+        spines = {'top': SkewSpine.linear_spine(self, 'top'),
                   'bottom': mspines.Spine.linear_spine(self, 'bottom'),
                   'left': mspines.Spine.linear_spine(self, 'left'),
                   'right': mspines.Spine.linear_spine(self, 'right')}
@@ -128,7 +109,7 @@ def _set_lim_and_transforms(self):
         """
         rot = 30
 
-        #Get the standard transform setup from the Axes base class
+        # Get the standard transform setup from the Axes base class
         Axes._set_lim_and_transforms(self)
 
         # Need to put the skew in the middle, after the scale and limits,
@@ -150,6 +131,12 @@ def _set_lim_and_transforms(self):
             transforms.IdentityTransform()) +
             transforms.Affine2D().skew_deg(rot, 0)) + self.transAxes
 
+    @property
+    def upper_xlim(self):
+        pts = [[0., 1.], [1., 1.]]
+        return self.transDataToAxes.inverted().transform(pts)[:, 0]
+
+
 # Now register the projection with matplotlib so the user can select
 # it.
 register_projection(SkewXAxes)
@@ -164,7 +151,7 @@ def test_set_line_coll_dash_image():
     ax.grid(True)
 
     # An example of a slanted line at constant X
-    l = ax.axvline(0, color='b')
+    ax.axvline(0, color='b')
 
 
 @image_comparison(baseline_images=['skew_rects'], remove_text=True)
