Merge remote-tracking branch 'upstream/v1.5.x'

mdboom · mdboom · commit 5a4faa2b24cd · 2015-10-20T10:59:06.000-04:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -14,7 +14,8 @@
 from matplotlib import unpack_labeled_data
 
 import matplotlib.cbook as cbook
-from matplotlib.cbook import mplDeprecation, STEP_LOOKUP_MAP
+from matplotlib.cbook import (mplDeprecation, STEP_LOOKUP_MAP,
+                              iterable, is_string_like)
 import matplotlib.collections as mcoll
 import matplotlib.colors as mcolors
 import matplotlib.contour as mcontour
@@ -43,10 +44,6 @@
 
 rcParams = matplotlib.rcParams
 
-iterable = cbook.iterable
-is_string_like = cbook.is_string_like
-is_sequence_of_strings = cbook.is_sequence_of_strings
-
 
 def _plot_args_replacer(args, data):
     if len(args) == 1:
@@ -1983,9 +1980,6 @@ def bar(self, left, height, width=0.8, bottom=None, **kwargs):
         edgecolor = kwargs.pop('edgecolor', None)
         linewidth = kwargs.pop('linewidth', None)
 
-        tick_label = kwargs.pop('tick_label', None)
-        label_ticks_flag = tick_label is not None
-
         # Because xerr and yerr will be passed to errorbar,
         # most dimension checking and processing will be left
         # to the errorbar method.
@@ -2001,6 +1995,7 @@ def bar(self, left, height, width=0.8, bottom=None, **kwargs):
         orientation = kwargs.pop('orientation', 'vertical')
         log = kwargs.pop('log', False)
         label = kwargs.pop('label', '')
+        tick_labels = kwargs.pop('tick_label', None)
 
         def make_iterable(x):
             if not iterable(x):
@@ -2016,7 +2011,6 @@ def make_iterable(x):
         _bottom = bottom
         bottom = make_iterable(bottom)
         linewidth = make_iterable(linewidth)
-        tick_label = make_iterable(tick_label)
 
         adjust_ylim = False
         adjust_xlim = False
@@ -2061,8 +2055,6 @@ def make_iterable(x):
 
         if len(linewidth) < nbars:
             linewidth *= nbars
-        if len(tick_label) < nbars:
-            tick_label *= nbars
 
         if color is None:
             color = [None] * nbars
@@ -2095,9 +2087,6 @@ def make_iterable(x):
         if len(bottom) != nbars:
             raise ValueError("incompatible sizes: argument 'bottom' "
                              "must be length %d or scalar" % nbars)
-        if len(tick_label) != nbars:
-            raise ValueError("incompatible sizes: argument 'tick_label' "
-                             "must be length %d or string" % nbars)
 
         patches = []
 
@@ -2193,9 +2182,18 @@ def make_iterable(x):
         bar_container = BarContainer(patches, errorbar, label=label)
         self.add_container(bar_container)
 
-        if label_ticks_flag:
+        if tick_labels is not None:
+            tick_labels = make_iterable(tick_labels)
+            if isinstance(tick_labels, six.string_types):
+                tick_labels = [tick_labels]
+            if len(tick_labels) == 1:
+                tick_labels *= nbars
+            if len(tick_labels) != nbars:
+                raise ValueError("incompatible sizes: argument 'tick_label' "
+                                 "must be length %d or string" % nbars)
+
             tick_label_axis.set_ticks(tick_label_position)
-            tick_label_axis.set_ticklabels(tick_label)
+            tick_label_axis.set_ticklabels(tick_labels)
 
         return bar_container
 
diff --git a/lib/matplotlib/fontconfig_pattern.py b/lib/matplotlib/fontconfig_pattern.py
@@ -6,9 +6,6 @@
 information.
 """
 
-# Author : Michael Droettboom <mdroe@stsci.edu>
-# License : matplotlib license (PSF compatible)
-
 # This class is defined here because it must be available in:
 #   - The old-style config framework (:file:`rcsetup.py`)
 #   - The traits-based config framework (:file:`mpltraits.py`)
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -717,10 +717,8 @@ def draw(self, renderer):
             i0, = self._x_filled.searchsorted([x0], 'left')
             i1, = self._x_filled.searchsorted([x1], 'right')
             subslice = slice(max(i0 - 1, 0), i1 + 1)
-            # Don't remake the Path unless it will be sufficiently smaller.
-            if subslice.start > 100 or len(self._x) - subslice.stop > 100:
-                self.ind_offset = subslice.start
-                self._transform_path(subslice)
+            self.ind_offset = subslice.start
+            self._transform_path(subslice)
 
         transf_path = self._get_transformed_path()
 
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -13,9 +13,6 @@
 fonts are supported.  There is experimental support for using
 arbitrary fonts, but results may vary without proper tweaking and
 metrics for those fonts.
-
-If you find TeX expressions that don't parse or render properly,
-please email mdroe@stsci.edu, but please check KNOWN ISSUES below first.
 """
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -1055,6 +1055,12 @@ def test_bar_tick_label_single():
     ax.bar("a", "b" , tick_label='a', data=data)
 
 
+@cleanup
+def test_bar_ticklabel_fail():
+    fig, ax = plt.subplots()
+    ax.bar([], [])
+
+
 @image_comparison(baseline_images=['bar_tick_label_multiple'],
                   extensions=['png'])
 def test_bar_tick_label_multiple():
@@ -1082,6 +1088,7 @@ def test_hist_log():
     ax = fig.add_subplot(111)
     ax.hist(data, fill=False, log=True)
 
+
 @image_comparison(baseline_images=['hist_bar_empty'], remove_text=True,
 	extensions=['png'])
 def test_hist_bar_empty():
diff --git a/setup.py b/setup.py
@@ -348,7 +348,7 @@ def run_tests(self):
         version=__version__,
         description="Python plotting package",
         author="John D. Hunter, Michael Droettboom",
-        author_email="mdroe@stsci.edu",
+        author_email="matplotlib-users@python.org",
         url="http://matplotlib.org",
         long_description="""
         matplotlib strives to produce publication quality 2D graphics
