Merge branch 'patch-1' of git://github.com/Tillsten/matplotlib into Tillsten-patch-1

efiring · efiring · commit 9d72862b0164 · 2014-05-22T08:20:15.000-10:00
Conflicts:
	CHANGELOG
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,8 @@
+2014-05-22 Allow the linscale keyword parameter of symlog scale to be
+           smaller than one.
+
 2014-05-20 Added logic to in FontManager to invalidate font-cache if
-	   if font-family rcparams have changed.
+           if font-family rcparams have changed.
 
 2014-05-16 Fixed the positioning of multi-line text in the PGF backend.
 
@@ -34,8 +37,8 @@
            of a generator at line 263.
 
 2014-02-25 In backend_qt4agg changed from using update -> repaint under
-	   windows.  See comment in source near `self._priv_update` for
-	   longer explaination.
+           windows.  See comment in source near `self._priv_update` for
+           longer explaination.
 
 2014-03-27 Added tests for pie ccw parameter. Removed pdf and svg images
            from tests for pie linewidth parameter.
@@ -66,7 +69,7 @@
 2014-02-28 Added 'origin' kwarg to `spy`
 
 2014-02-27 Implemented separate horizontal/vertical axes padding to the
-	   ImageGrid in the AxesGrid toolkit
+           ImageGrid in the AxesGrid toolkit
 
 2014-02-27 Allowed markevery property of matplotlib.lines.Line2D to be, an int
            numpy fancy index, slice object, or float.  The float behaviour
diff --git a/lib/matplotlib/scale.py b/lib/matplotlib/scale.py
@@ -449,7 +449,7 @@ def __init__(self, axis, **kwargs):
 
         assert base > 1.0
         assert linthresh > 0.0
-        assert linscale >= 1.0
+        assert linscale > 0.0
 
         self._transform = self.SymmetricalLogTransform(base,
                                                        linthresh,
