FIX:

jklymak · jklymak · commit a2b5f8931117 · 2018-11-04T22:10:16.000-08:00
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -1028,58 +1028,9 @@ def _update_ticks(self, renderer):
                     ihigh = locs[-1]
             tick_tups = [ti for ti in tick_tups if ilow <= ti[1] <= ihigh]
 
-<<<<<<< HEAD
-        # so that we don't lose ticks on the end, expand out the interval ever
-        # so slightly.  The "ever so slightly" is defined to be the width of a
-        # half of a pixel.  We don't want to draw a tick that even one pixel
-        # outside of the defined axis interval.
-        if interval[0] <= interval[1]:
-            interval_expanded = interval
-        else:
-            interval_expanded = interval[1], interval[0]
-
-        if hasattr(self, '_get_pixel_distance_along_axis'):
-            # normally, one does not want to catch all exceptions that
-            # could possibly happen, but it is not clear exactly what
-            # exceptions might arise from a user's projection (their
-            # rendition of the Axis object).  So, we catch all, with
-            # the idea that one would rather potentially lose a tick
-            # from one side of the axis or another, rather than see a
-            # stack trace.
-            # We also catch users warnings here. These are the result of
-            # invalid numpy calculations that may be the result of out of
-            # bounds on axis with finite allowed intervals such as geo
-            # projections i.e. Mollweide.
-            with np.errstate(invalid='ignore'):
-                try:
-                    ds1 = self._get_pixel_distance_along_axis(
-                        interval_expanded[0], -0.5)
-                except Exception:
-                    cbook._warn_external("Unable to find pixel distance "
-                                         "along axis for interval padding of "
-                                         "ticks; assuming no interval "
-                                         "padding needed.")
-                    ds1 = 0.0
-                if np.isnan(ds1):
-                    ds1 = 0.0
-                try:
-                    ds2 = self._get_pixel_distance_along_axis(
-                        interval_expanded[1], +0.5)
-                except Exception:
-                    cbook._warn_external("Unable to find pixel distance "
-                                         "along axis for interval padding of "
-                                         "ticks; assuming no interval "
-                                         "padding needed.")
-                    ds2 = 0.0
-                if np.isnan(ds2):
-                    ds2 = 0.0
-            interval_expanded = (interval_expanded[0] - ds1,
-                                 interval_expanded[1] + ds2)
-=======
         if interval[1] <= interval[0]:
              interval = interval[1], interval[0]
         inter = self.get_transform().transform(interval)
->>>>>>> MNT: simplify valid tick logic
 
         ticks_to_draw = []
         for tick, loc, label in tick_tups:
