Merge remote-tracking branch 'matplotlib/v2.0.x'

tacaswell · tacaswell · commit 85e52f6557cd · 2017-05-10T17:23:24.000-04:00
diff --git a/doc/users/dflt_style_changes.rst b/doc/users/dflt_style_changes.rst
@@ -416,6 +416,10 @@ By default, caps on the ends of errorbars are not present.
    demo(ax1, {'errorbar.capsize': 3}, 'classic')
    demo(ax2, {}, 'v2.0')
 
+This also changes the return value of
+:meth:`~matplotlib.axes.Axes.errorbar` as the list of 'caplines' will
+be empty by default.
+
 The previous defaults can be restored by setting::
 
     mpl.rcParams['errorbar.capsize'] = 3
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -976,7 +976,7 @@ def _num_to_string(self, x, vmin, vmax):
         else:
             s = self.pprint_val(x, vmax - vmin)
         return s
-   
+
     def __call__(self, x, pos=None):
         """
         Return the format for tick val `x`.
