Merge branch 'v1.5.x' into v2.x

tacaswell · tacaswell · commit 7688c90bd7f2 · 2015-12-22T18:11:36.000-05:00
diff --git a/doc/devel/gitwash/set_up_fork.rst b/doc/devel/gitwash/set_up_fork.rst
@@ -52,7 +52,7 @@ Linking your repository to the upstream repo
 main matplotlib_ repository at `matplotlib github`_.
 
 Note that we've used ``git://`` for the URL rather than ``git@``.  The
-``git://`` URL is read only.  This means we that we can't accidentally
+``git://`` URL is read only.  This means that we can't accidentally
 (or deliberately) write to the upstream repo, and we are only going to
 use it to merge into our own code.
 
diff --git a/doc/users/plotting/examples/axes_zoom_effect.py b/doc/users/plotting/examples/axes_zoom_effect.py
diff --git a/examples/api/filled_step.py b/examples/api/filled_step.py
@@ -41,7 +41,7 @@ def filled_hist(ax, edges, values, bottoms=None, orientation='v',
     """
     print(orientation)
     if orientation not in set('hv'):
-        raise ValueError("orientation must be in {'h', 'v'} "
+        raise ValueError("orientation must be in {{'h', 'v'}} "
                          "not {o}".format(o=orientation))
 
     kwargs.setdefault('step', 'post')
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1441,6 +1441,7 @@ def tk_window_focus():
     'matplotlib.tests.test_colorbar',
     'matplotlib.tests.test_colors',
     'matplotlib.tests.test_compare_images',
+    'matplotlib.tests.test_container',
     'matplotlib.tests.test_contour',
     'matplotlib.tests.test_dates',
     'matplotlib.tests.test_delaunay',
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -633,21 +633,22 @@ def annotate(self, *args, **kwargs):
             label
 
         xy : (x, y)
-            position of element to annotate
+            position of element to annotate. See *xycoords* to control what
+            coordinate system this value is interpretated in.
 
         xytext : (x, y) , optional, default: None
-            position of the label `s`
+            position of the label `s`. See *textcoords* to control what
+            coordinate system this value is interpreted in.
 
         xycoords : string, optional, default: "data"
             string that indicates what type of coordinates `xy` is. Examples:
             "figure points", "figure pixels", "figure fraction", "axes
             points", .... See `matplotlib.text.Annotation` for more details.
 
-        textcoords : string, optional
+        textcoords : string, optional, default: None
             string that indicates what type of coordinates `text` is. Examples:
             "figure points", "figure pixels", "figure fraction", "axes
             points", .... See `matplotlib.text.Annotation` for more details.
-            Default is None.
 
         arrowprops : `matplotlib.lines.Line2D` properties, optional
             Dictionary of line properties for the arrow that connects
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -904,8 +904,11 @@ def process_value(value):
             is_scalar = False
             result = ma.asarray(value)
             if result.dtype.kind == 'f':
-                if isinstance(value, np.ndarray):
-                    result = result.copy()
+                # this is overkill for lists of floats, but required
+                # to support pd.Series as input until we can reliable
+                # determine if result and value share memory in all cases
+                # (list, tuple, deque, ndarray, Series, ...)
+                result = result.copy()
             elif result.dtype.itemsize > 2:
                 result = result.astype(np.float)
             else:
diff --git a/lib/matplotlib/container.py b/lib/matplotlib/container.py
@@ -4,6 +4,7 @@
 from matplotlib.externals import six
 
 import matplotlib.cbook as cbook
+import matplotlib.artist as martist
 
 
 class Container(tuple):
@@ -31,7 +32,9 @@ def set_remove_method(self, f):
         self._remove_method = f
 
     def remove(self):
-        for c in self:
+        for c in cbook.flatten(self,
+                               scalarp=lambda x: isinstance(x,
+                                                            martist.Artist)):
             c.remove()
 
         if self._remove_method:
diff --git a/lib/matplotlib/tests/test_container.py b/lib/matplotlib/tests/test_container.py
@@ -0,0 +1,14 @@
+from __future__ import (absolute_import, division, print_function,
+                        unicode_literals)
+
+from matplotlib.externals import six
+import matplotlib.pyplot as plt
+
+from matplotlib.testing.decorators import cleanup
+
+
+@cleanup
+def test_stem_remove():
+    ax = plt.gca()
+    st = ax.stem([1, 2], [1, 2])
+    st.remove()
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -1590,7 +1590,7 @@ def __init__(self, ax, x, y, marker='o', marker_props=None, useblit=True):
         self.ax = ax
 
         props = dict(marker=marker, markersize=7, mfc='w', ls='none',
-                     alpha=0.5, visible=False)
+                     alpha=0.5, visible=False, label='_nolegend_')
         props.update(marker_props if marker_props is not None else {})
         self._markers = Line2D(x, y, animated=useblit, **props)
         self.ax.add_line(self._markers)
@@ -1788,11 +1788,13 @@ def __init__(self, ax, onselect, drawtype='box',
         self._edge_order = ['W', 'N', 'E', 'S']
         xe, ye = self.edge_centers
         self._edge_handles = ToolHandles(self.ax, xe, ye, marker='s',
-                                         marker_props=props, useblit=self.useblit)
+                                         marker_props=props,
+                                         useblit=self.useblit)
 
         xc, yc = self.center
         self._center_handle = ToolHandles(self.ax, [xc], [yc], marker='s',
-                                          marker_props=props, useblit=self.useblit)
+                                          marker_props=props,
+                                          useblit=self.useblit)
 
         self.active_handle = None
 
diff --git a/unit/threading_test.py b/unit/threading_test.py
@@ -37,7 +37,7 @@ def png_thread(tn):
             ax.hist(vals, 50)
             FigureCanvas(fig).print_png(png_f)
 
-        except Exception, excp:
+        except Exception as excp:
             pass
 
         png_f.close()
