Merge branch 'v2.x'

tacaswell · tacaswell · commit c32bb0dc67b0 · 2015-12-23T11:09:25.000-05:00
Conflicts:
	lib/matplotlib/lines.py
	    import whitespace issues
	lib/matplotlib/markers.py
	    whitespace vs _empty_path changes
	lib/matplotlib/tests/test_axes.py
	    test order issues
	lib/matplotlib/tests/test_lines.py
	    test order issues
	lib/mpl_toolkits/tests/test_axes_grid1.py
	    new test vs white space issue
	setup.py
	    new functionality vs white space issue
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1445,6 +1445,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/animation.py b/lib/matplotlib/animation.py
@@ -756,6 +756,8 @@ def save(self, filename, writer=None, fps=None, dpi=None, codec=None,
         # Re-use the savefig DPI for ours if none is given
         if dpi is None:
             dpi = rcParams['savefig.dpi']
+            if dpi == 'figure':
+                dpi = self._fig.dpi
 
         if codec is None:
             codec = rcParams['animation.codec']
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -2141,6 +2141,8 @@ def print_figure(self, filename, dpi=None, facecolor='w', edgecolor='w',
 
         if dpi is None:
             dpi = rcParams['savefig.dpi']
+            if dpi == 'figure':
+                dpi = self.figure.dpi
 
         origDPI = self.figure.dpi
         origfacecolor = self.figure.get_facecolor()
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/tests/test_lines.py b/lib/matplotlib/tests/test_lines.py
@@ -156,7 +156,6 @@ def test_marker_fill_styles():
 
 
 def test_nan_is_sorted():
-    # Exercises issue from PR #2744 (NaN throwing warning in _is_sorted)
     line = mlines.Line2D([],[])
     assert_true(line._is_sorted(np.array([1, 2, 3])))
     assert_true(line._is_sorted(np.array([1, np.nan, 3])))
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
 
