undo SciNotation as default

zblz · zblz · commit 0596444b21d8 · 2016-07-24T17:29:13.000+01:00
diff --git a/lib/matplotlib/scale.py b/lib/matplotlib/scale.py
@@ -8,7 +8,7 @@
 
 from matplotlib.cbook import dedent
 from matplotlib.ticker import (NullFormatter, ScalarFormatter,
-                               LogFormatterSciNotation, LogitFormatter)
+                               LogFormatterMathtext, LogitFormatter)
 from matplotlib.ticker import (NullLocator, LogLocator, AutoLocator,
                                SymmetricalLogLocator, LogitLocator)
 from matplotlib.transforms import Transform, IdentityTransform
@@ -304,9 +304,9 @@ def set_default_locators_and_formatters(self, axis):
         log scaling.
         """
         axis.set_major_locator(LogLocator(self.base))
-        axis.set_major_formatter(LogFormatterSciNotation(self.base))
+        axis.set_major_formatter(LogFormatterMathtext(self.base))
         axis.set_minor_locator(LogLocator(self.base, self.subs))
-        axis.set_minor_formatter(LogFormatterSciNotation(self.base))
+        axis.set_minor_formatter(NullFormatter())
 
     def get_transform(self):
         """
@@ -462,10 +462,10 @@ def set_default_locators_and_formatters(self, axis):
         symmetrical log scaling.
         """
         axis.set_major_locator(SymmetricalLogLocator(self.get_transform()))
-        axis.set_major_formatter(LogFormatterSciNotation(self.base))
+        axis.set_major_formatter(LogFormatterMathtext(self.base))
         axis.set_minor_locator(SymmetricalLogLocator(self.get_transform(),
                                                      self.subs))
-        axis.set_minor_formatter(LogFormatterSciNotation(self.base))
+        axis.set_minor_formatter(NullFormatter())
 
     def get_transform(self):
         """
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -953,11 +953,11 @@ class LogFormatterMathtext(LogFormatter):
 
     def _non_decade_format(self, sign_string, base, fx, usetex):
         'Return string for non-decade locations'
-            if usetex:
-                return (r'$%s%s^{%.2f}$') % (sign_string, base, fx)
-            else:
-                return ('$%s$' % _mathdefault('%s%s^{%.2f}' %
-                    (sign_string, base, fx)))
+        if usetex:
+            return (r'$%s%s^{%.2f}$') % (sign_string, base, fx)
+        else:
+            return ('$%s$' % _mathdefault('%s%s^{%.2f}' %
+                (sign_string, base, fx)))
 
     def __call__(self, x, pos=None):
         """
@@ -1021,8 +1021,8 @@ def _non_decade_format(self, sign_string, base, fx, usetex):
             return (r'$%g\times%s^{%d}$') % \
                                         (coeff, base, exponent)
         else:
-            return (r'$\mathdefault{%g\times%s^{%d}}$') % \
-                                        (coeff, base, exponent)
+            return ('$%s$' % _mathdefault(r'%g\times%s^{%d}' %
+                                        (coeff, base, exponent)))
 
 
 class LogitFormatter(Formatter):
