Updatefmt with loc - introduce private locator setter

ImportanceOfBeingErnest · ImportanceOfBeingErnest · commit 5dffdd13a43a · 2018-10-18T20:55:55.000+02:00
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -1567,8 +1567,6 @@ def set_minor_formatter(self, formatter):
                             "matplotlib.ticker.Formatter")
         self.isDefault_minfmt = False
         self.minor.formatter = formatter
-        if hasattr(self.minor.formatter, "_ismajor"):
-            self.minor.formatter._ismajor = False
         formatter.set_axis(self)
         self.stale = True
 
@@ -1585,6 +1583,8 @@ def set_major_locator(self, locator):
                             "matplotlib.ticker.Locator")
         self.isDefault_majloc = False
         self.major.locator = locator
+        if self.major.formatter:
+            self.major.formatter._set_locator(locator)
         locator.set_axis(self)
         self.stale = True
 
@@ -1601,6 +1601,8 @@ def set_minor_locator(self, locator):
                             "matplotlib.ticker.Locator")
         self.isDefault_minloc = False
         self.minor.locator = locator
+        if self.minor.formatter:
+            self.minor.formatter._set_locator(locator)
         locator.set_axis(self)
         self.stale = True
 
diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -806,7 +806,6 @@ def __init__(self, locator, tz=None, defaultfmt='%Y-%m-%d'):
         returned by ``locator._get_unit()``.
         """
         self._locator = locator
-        self._ismajor = True
         self._tz = tz
         self.defaultfmt = defaultfmt
         self._formatter = DateFormatter(self.defaultfmt, tz)
@@ -821,13 +820,10 @@ def __init__(self, locator, tz=None, defaultfmt='%Y-%m-%d'):
                        1. / (MUSECONDS_PER_DAY):
                            rcParams['date.autoformatter.microsecond']}
 
+    def _set_locator(self, locator):
+        self._locator = locator
+
     def __call__(self, x, pos=None):
-        # Check if locator is still the one from the axis to format
-        if hasattr(self.axis, "get_major_locator"):
-            pot_locator = self.axis.get_major_locator() if self._ismajor \
-                          else self.axis.get_minor_locator()
-            if self._locator is not pot_locator:
-                self._locator = pot_locator
         try:
             locator_unit_scale = float(self._locator._get_unit())
         except AttributeError:
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -301,6 +301,10 @@ def fix_minus(self, s):
         """
         return s
 
+    def _set_locator(self, locator):
+        """ Subclasses may want to override this to set a locator. """
+        pass
+
 
 class IndexFormatter(Formatter):
     """
