Merge branch 'v1.0.x'

leejjoon · leejjoon · commit 578f6952d91c · 2011-03-17T12:44:10.000+09:00
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -234,7 +234,7 @@ def __init__(self, ax, cmap=None,
             self.locator = ticks    # Handle default in _ticker()
         if format is None:
             if isinstance(self.norm, colors.LogNorm):
-                self.formatter = ticker.LogFormatter()
+                self.formatter = ticker.LogFormatterMathtext()
             else:
                 self.formatter = ticker.ScalarFormatter()
         elif cbook.is_string_like(format):
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -545,7 +545,7 @@ def __call__(self, x, pos=None):
         sign = np.sign(x)
         # only label the decades
         fx = math.log(abs(x))/math.log(b)
-        isDecade = is_decade(fx)
+        isDecade = is_close_to_int(fx)
         if not isDecade and self.labelOnlyBase: s = ''
         elif x>10000: s= '%1.0e'%x
         elif x<1: s =  '%1.0e'%x
