alternative fix

Yi Wei · Yi Wei · commit 13b8af494779 · 2023-07-10T08:36:28.000+02:00
fix format
diff --git a/lib/matplotlib/scale.py b/lib/matplotlib/scale.py
@@ -288,7 +288,7 @@ def __init__(self, axis, *, base=10, subs=None, nonpositive="clip"):
     def set_default_locators_and_formatters(self, axis):
         # docstring inherited
         axis.set_major_locator(LogLocator(self.base))
-        axis.set_major_formatter(LogFormatterSciNotation(self.base))
+        axis.set_major_formatter(LogFormatterSciNotation(self.base, labelOnlyBase=True))
         axis.set_minor_locator(LogLocator(self.base, self.subs))
         axis.set_minor_formatter(
             LogFormatterSciNotation(self.base,
@@ -451,7 +451,7 @@ def __init__(self, axis, *, base=10, linthresh=2, subs=None, linscale=1):
     def set_default_locators_and_formatters(self, axis):
         # docstring inherited
         axis.set_major_locator(SymmetricalLogLocator(self.get_transform()))
-        axis.set_major_formatter(LogFormatterSciNotation(self.base))
+        axis.set_major_formatter(LogFormatterSciNotation(self.base, labelOnlyBase=True))
         axis.set_minor_locator(SymmetricalLogLocator(self.get_transform(),
                                                      self.subs))
         axis.set_minor_formatter(NullFormatter())
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -2969,6 +2969,7 @@ def test_log_scales():
     ax.set_yscale('log', base=5.5)
     ax.invert_yaxis()
     ax.set_xscale('log', base=9.0)
+    fmt = ax.yaxis.get_major_formatter()
     xticks, yticks = [
         [(t.get_loc(), t.label1.get_text()) for t in axis._update_ticks()]
         for axis in [ax.xaxis, ax.yaxis]
diff --git a/lib/matplotlib/tests/test_ticker.py b/lib/matplotlib/tests/test_ticker.py
@@ -1,4 +1,3 @@
-import math
 from contextlib import nullcontext
 import itertools
 import locale
@@ -1142,13 +1141,13 @@ def _sub_labels(self, axis, subs=()):
         label_test = [fmt(x) != '' for x in minor_tlocs]
         assert label_test == label_expected
 
-    def _only_base_labels(self, axis):
+    def _no_minor_labels(self, axis):
         fmt = axis.get_minor_formatter()
         minor_tlocs = axis.get_minorticklocs()
         fmt.set_locs(minor_tlocs)
         fxs = np.log(minor_tlocs)/np.log(10)
-        label_expected = [math.isclose(fx, round(fx)) for fx in fxs]
-        label_test = [fmt(x) != '' for x in minor_tlocs]
+        label_expected = [True] * len(fxs)
+        label_test = [fmt(x) == '' for x in minor_tlocs]
         assert label_test == label_expected
 
     @mpl.style.context('default')
@@ -1196,7 +1195,7 @@ def test_sublabel(self):
                 minor_thresholds=(0, 0)
             )
         )
-        self._only_base_labels(ax.xaxis)
+        self._no_minor_labels(ax.xaxis)
 
     @pytest.mark.parametrize('val', [1, 10, 100, 1000])
     def test_LogFormatter_call(self, val):
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -949,7 +949,7 @@ def set_locs(self, locs=None):
             numdec = abs(vmax - vmin)
 
         if numdec > self.minor_thresholds[0]:
-            # Label only bases
+            # No minor ticks will be labeled
             self._sublabels = {}
         elif numdec > self.minor_thresholds[1]:
             # Add labels between bases at log-spaced coefficients;
@@ -985,7 +985,7 @@ def __call__(self, x, pos=None):
         coeff = round(b ** (fx - exponent))
 
         # Label only bases
-        if self.labelOnlyBase or self._sublabels == {}:
+        if self.labelOnlyBase:
             if not is_x_decade:
                 return ''
         elif self._sublabels is not None and coeff not in self._sublabels:
@@ -1072,8 +1072,7 @@ def __call__(self, x, pos=None):
         if is_x_decade:
             fx = round(fx)
 
-        # Label only bases
-        if self.labelOnlyBase or self._sublabels == {}:
+        if self.labelOnlyBase:
             if not is_x_decade:
                 return ''
         elif self._sublabels is not None and coeff not in self._sublabels:
