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

mdboom · mdboom · commit 00b74bd4814c · 2015-11-30T14:31:04.000-05:00
diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
@@ -27,7 +27,12 @@
 import platform
 import sys
 import itertools
-import base64
+try:
+    # python3
+    from base64 import encodebytes
+except ImportError:
+    # python2
+    from base64 import encodestring as encodebytes
 import contextlib
 import tempfile
 from matplotlib.cbook import iterable, is_string_like
@@ -927,7 +932,7 @@ def to_html5_video(self):
 
             # Now open and base64 encode
             with open(f.name, 'rb') as video:
-                vid64 = base64.encodebytes(video.read())
+                vid64 = encodebytes(video.read())
                 self._base64_video = vid64.decode('ascii')
                 self._video_size = 'width="{0}" height="{1}"'.format(
                         *writer.frame_size)
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -3354,7 +3354,7 @@ def bxp(self, bxpstats, positions=None, widths=None, vert=True,
           - ``q1``: The first quartile (25th percentile) (scalar
             float).
 
-          - ``q3``: The first quartile (50th percentile) (scalar
+          - ``q3``: The third quartile (75th percentile) (scalar
             float).
 
           - ``whislo``: Lower bound of the lower whisker (scalar
@@ -7272,27 +7272,27 @@ def violinplot(self, dataset, positions=None, vert=True, widths=0.5,
               :class:`matplotlib.collections.PolyCollection` instances
               containing the filled area of each violin.
 
-            - ``means``: A
+            - ``cmeans``: A
               :class:`matplotlib.collections.LineCollection` instance
               created to identify the mean values of each of the
               violin's distribution.
 
-            - ``mins``: A
+            - ``cmins``: A
               :class:`matplotlib.collections.LineCollection` instance
               created to identify the bottom of each violin's
               distribution.
 
-            - ``maxes``: A
+            - ``cmaxes``: A
               :class:`matplotlib.collections.LineCollection` instance
               created to identify the top of each violin's
               distribution.
 
-            - ``bars``: A
+            - ``cbars``: A
               :class:`matplotlib.collections.LineCollection` instance
               created to identify the centers of each violin's
               distribution.
 
-            - ``medians``: A
+            - ``cmedians``: A
               :class:`matplotlib.collections.LineCollection` instance
               created to identify the median values of each of the
               violin's distribution.
@@ -7378,27 +7378,27 @@ def violin(self, vpstats, positions=None, vert=True, widths=0.5,
               :class:`matplotlib.collections.PolyCollection` instances
               containing the filled area of each violin.
 
-            - ``means``: A
+            - ``cmeans``: A
               :class:`matplotlib.collections.LineCollection` instance
               created to identify the mean values of each of the
               violin's distribution.
 
-            - ``mins``: A
+            - ``cmins``: A
               :class:`matplotlib.collections.LineCollection` instance
               created to identify the bottom of each violin's
               distribution.
 
-            - ``maxes``: A
+            - ``cmaxes``: A
               :class:`matplotlib.collections.LineCollection` instance
               created to identify the top of each violin's
               distribution.
 
-            - ``bars``: A
+            - ``cbars``: A
               :class:`matplotlib.collections.LineCollection` instance
               created to identify the centers of each violin's
               distribution.
 
-            - ``medians``: A
+            - ``cmedians``: A
               :class:`matplotlib.collections.LineCollection` instance
               created to identify the median values of each of the
               violin's distribution.
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -1127,7 +1127,13 @@ def set_color_cycle(self, clist):
         """
         cbook.warn_deprecated(
                 '1.5', name='set_color_cycle', alternative='set_prop_cycle')
-        self.set_prop_cycle('color', clist)
+        if clist is None:
+            # Calling set_color_cycle() or set_prop_cycle() with None
+            # effectively resets the cycle, but you can't do
+            # set_prop_cycle('color', None). So we are special-casing this.
+            self.set_prop_cycle(None)
+        else:
+            self.set_prop_cycle('color', clist)
 
     def ishold(self):
         """return the HOLD status of the axes"""
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -142,14 +142,13 @@ def contains(self, mouseevent, radius=None):
 
         Returns T/F, {}
         """
-        # This is a general version of contains that should work on any
-        # patch with a path.  However, patches that have a faster
-        # algebraic solution to hit-testing should override this
-        # method.
         if six.callable(self._contains):
             return self._contains(self, mouseevent)
         if radius is None:
-            radius = self.get_linewidth()
+            if cbook.is_numlike(self._picker):
+                radius = self._picker
+            else:
+                radius = self.get_linewidth()
         inside = self.get_path().contains_point(
             (mouseevent.x, mouseevent.y), self.get_transform(), radius)
         return inside, {}
@@ -160,7 +159,10 @@ def contains_point(self, point, radius=None):
         (transformed with its transform attribute).
         """
         if radius is None:
-            radius = self.get_linewidth()
+            if cbook.is_numlike(self._picker):
+                radius = self._picker
+            else:
+                radius = self.get_linewidth()
         return self.get_path().contains_point(point,
                                               self.get_transform(),
                                               radius)
@@ -670,15 +672,6 @@ def get_patch_transform(self):
         self._update_patch_transform()
         return self._rect_transform
 
-    def contains(self, mouseevent):
-        # special case the degenerate rectangle
-        if self._width == 0 or self._height == 0:
-            return False, {}
-
-        x, y = self.get_transform().inverted().transform_point(
-            (mouseevent.x, mouseevent.y))
-        return (x >= 0.0 and x <= 1.0 and y >= 0.0 and y <= 1.0), {}
-
     def get_x(self):
         "Return the left coord of the rectangle"
         return self._x
@@ -1416,12 +1409,6 @@ def get_patch_transform(self):
         self._recompute_transform()
         return self._patch_transform
 
-    def contains(self, ev):
-        if ev.x is None or ev.y is None:
-            return False, {}
-        x, y = self.get_transform().inverted().transform_point((ev.x, ev.y))
-        return (x * x + y * y) <= 1.0, {}
-
 
 class Circle(Ellipse):
     """
diff --git a/lib/matplotlib/tests/baseline_images/test_collections/size_in_xy.png b/lib/matplotlib/tests/baseline_images/test_collections/size_in_xy.png
diff --git a/lib/matplotlib/tests/test_collections.py b/lib/matplotlib/tests/test_collections.py
@@ -597,6 +597,26 @@ def test_linestyle_single_dashes():
     plt.draw()
 
 
+@image_comparison(baseline_images=['size_in_xy'], remove_text=True,
+                  extensions=['png'])
+def test_size_in_xy():
+    fig, ax = plt.subplots()
+
+    widths, heights, angles = (10, 10), 10, 0
+    widths = 10, 10
+    coords = [(10, 10), (15, 15)]
+    e = mcollections.EllipseCollection(
+        widths, heights, angles,
+        units='xy',
+        offsets=coords,
+        transOffset=ax.transData)
+
+    ax.add_collection(e)
+
+    ax.set_xlim(0, 30)
+    ax.set_ylim(0, 30)
+
+
 if __name__ == '__main__':
     import nose
     nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
diff --git a/lib/matplotlib/tests/test_cycles.py b/lib/matplotlib/tests/test_cycles.py
@@ -1,3 +1,5 @@
+import warnings
+
 from matplotlib.testing.decorators import image_comparison, cleanup
 import matplotlib.pyplot as plt
 import numpy as np
@@ -147,6 +149,30 @@ def test_valid_input_forms():
     assert True
 
 
+@cleanup
+def test_cycle_reset():
+    fig, ax = plt.subplots()
+
+    # Can't really test a reset because only a cycle object is stored
+    # but we can test the first item of the cycle.
+    prop = next(ax._get_lines.prop_cycler)
+    ax.set_prop_cycle(linewidth=[10, 9, 4])
+    assert prop != next(ax._get_lines.prop_cycler)
+    ax.set_prop_cycle(None)
+    got = next(ax._get_lines.prop_cycler)
+    assert prop == got, "expected %s, got %s" % (prop, got)
+
+    fig, ax = plt.subplots()
+    # Need to double-check the old set/get_color_cycle(), too
+    with warnings.catch_warnings():
+        prop = next(ax._get_lines.prop_cycler)
+        ax.set_color_cycle(['c', 'm', 'y', 'k'])
+        assert prop != next(ax._get_lines.prop_cycler)
+        ax.set_color_cycle(None)
+        got = next(ax._get_lines.prop_cycler)
+        assert prop == got, "expected %s, got %s" % (prop, got)
+
+
 @cleanup
 def test_invalid_input_forms():
     fig, ax = plt.subplots()
diff --git a/lib/matplotlib/tests/test_pickle.py b/lib/matplotlib/tests/test_pickle.py
@@ -279,6 +279,9 @@ def test_transform():
     assert_equal(obj.wrapper._child, obj.composite)
     # Check child -> parent links of TransformWrapper.
     assert_equal(list(obj.wrapper._parents.values()), [obj.composite2])
+    # Check input and output dimensions are set as expected.
+    assert_equal(obj.wrapper.input_dims, obj.composite.input_dims)
+    assert_equal(obj.wrapper.output_dims, obj.composite.output_dims)
 
 
 if __name__ == '__main__':
diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py
@@ -1552,17 +1552,24 @@ def __eq__(self, other):
         def __str__(self):
             return str(self._child)
 
+    # NOTE: Transform.__[gs]etstate__ should be sufficient when using only
+    # Python 3.4+.
     def __getstate__(self):
-        # only store the child and parents
+        # only store the child information and parents
         return {
             'child': self._child,
+            'input_dims': self.input_dims,
+            'output_dims': self.output_dims,
             # turn the weakkey dictionary into a normal dictionary
             'parents': dict(six.iteritems(self._parents))
         }
 
     def __setstate__(self, state):
         # re-initialise the TransformWrapper with the state's child
         self._init(state['child'])
+        # The child may not be unpickled yet, so restore its information.
+        self.input_dims = state['input_dims']
+        self.output_dims = state['output_dims']
         # turn the normal dictionary back into a WeakValueDictionary
         self._parents = WeakValueDictionary(state['parents'])
 
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
diff --git a/setupext.py b/setupext.py
diff --git a/src/_backend_agg.h b/src/_backend_agg.h
