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

Conflicts:
	.travis.yml
	lib/matplotlib/tests/baseline_images/test_png/pngsuite.png
	lib/matplotlib/tests/test_axes.py

Author: mdboom

.travis.yml

@@ -4,6 +4,7 @@ python:
   - 2.6
   - 2.7
   - 3.2
+  - 3.3
 
 install:
   - pip install --use-mirrors nose python-dateutil

lib/matplotlib/axes.py

@@ -9283,7 +9283,14 @@ def _make_twin_axes(self, *kl, **kwargs):
         """
         make a twinx axes of self. This is used for twinx and twiny.
         """
-        ax2 = self.figure.add_subplot(self.get_subplotspec(), *kl, **kwargs)
+        from matplotlib.projections import process_projection_requirements
+        kl = (self.get_subplotspec(),) + kl
+        projection_class, kwargs, key = process_projection_requirements(
+            self.figure, *kl, **kwargs)
+
+        ax2 = subplot_class_factory(projection_class)(self.figure,
+                                                      *kl, **kwargs)
+        self.figure.add_subplot(ax2)
         return ax2
 
 _subplot_classes = {}

lib/matplotlib/backends/backend_svg.py

@@ -1,6 +1,6 @@
 from __future__ import division
 
-import os, base64, tempfile, urllib, gzip, io, sys, codecs
+import os, base64, tempfile, urllib, gzip, io, sys, codecs, re
 
 import numpy as np
 
@@ -71,6 +71,11 @@ def escape_cdata(s):
     s = s.replace(u">", u">")
     return s
 
+_escape_xml_comment = re.compile(r'-(?=-)')
+def escape_comment(s):
+    s = escape_cdata(s)
+    return _escape_xml_comment.sub('- ', s)
+
 def escape_attrib(s):
     s = s.replace(u"&", u"&")
     s = s.replace(u"'", u"'")
@@ -146,7 +151,7 @@ def start(self, tag, attrib={}, **extra):
     def comment(self, comment):
         self.__flush()
         self.__write(self.__indentation[:len(self.__tags)])
-        self.__write(u"<!-- %s -->\n" % escape_cdata(comment))
+        self.__write(u"<!-- %s -->\n" % escape_comment(comment))
 
     ##
     # Adds character data to the output stream.

lib/matplotlib/collections.py

@@ -305,7 +305,8 @@ def contains(self, mouseevent):
         ind = mpath.point_in_path_collection(
             mouseevent.x, mouseevent.y, pickradius,
             transform.frozen(), paths, self.get_transforms(),
-            offsets, transOffset, pickradius <= 0)
+            offsets, transOffset, pickradius <= 0,
+            self.get_offset_position())
 
         return len(ind) > 0, dict(ind=ind)
 

lib/matplotlib/tests/baseline_images/test_axes/twin_spines.png

@@ -1,5 +1,7 @@
 from __future__ import print_function
 
+import numpy as np
+
 from matplotlib.testing.decorators import cleanup
 
 import matplotlib.pyplot as plt
@@ -88,6 +90,19 @@ def test_collection_transform_of_none():
     assert isinstance(c._transOffset, mtrans.IdentityTransform)
 
 
+def test_point_in_path():
+    from matplotlib.path import Path
+
+    # Test #1787
+    verts2 = [(0,0), (0,1), (1,1), (1,0), (0,0)]
+
+    path = Path(verts2, closed=True)
+    points = [(0.5,0.5), (1.5,0.5)]
+
+    assert np.all(path.contains_points(points) == [True, False])
+
+
+
 if __name__=='__main__':
     import nose
     nose.runmodule(argv=['-s','--with-doctest'], exit=False)

lib/matplotlib/tests/test_artist.py

@@ -438,6 +438,24 @@ def test_hexbin_extent():
 
     ax.hexbin(x, y, extent=[.1, .3, .6, .7])
 
+@cleanup
+def test_hexbin_pickable():
+    # From #1973: Test that picking a hexbin collection works
+    class FauxMouseEvent:
+        def __init__(self, x, y):
+            self.x = x
+            self.y = y
+
+    fig = plt.figure()
+
+    ax = fig.add_subplot(111)
+    data = np.arange(200.)/200.
+    data.shape = 2, 100
+    x, y = data
+    hb = ax.hexbin(x, y, extent=[.1, .3, .6, .7], picker=1)
+
+    assert hb.contains(FauxMouseEvent(400, 300))[0]
+
 @image_comparison(baseline_images=['hexbin_log'],
                   remove_text=True,
                   extensions=['png'])
@@ -1497,6 +1515,53 @@ def test_csd_noise():
     ax3.set_ylabel('')
 
 
+@image_comparison(baseline_images=['twin_spines'], remove_text=True,
+                  extensions=['png'])
+def test_twin_spines():
+
+    def make_patch_spines_invisible(ax):
+        ax.set_frame_on(True)
+        ax.patch.set_visible(False)
+        for sp in ax.spines.itervalues():
+            sp.set_visible(False)
+
+    fig = plt.figure(figsize=(4, 3))
+    fig.subplots_adjust(right=0.75)
+
+    host = fig.add_subplot(111)
+    par1 = host.twinx()
+    par2 = host.twinx()
+
+    # Offset the right spine of par2.  The ticks and label have already been
+    # placed on the right by twinx above.
+    par2.spines["right"].set_position(("axes", 1.2))
+    # Having been created by twinx, par2 has its frame off, so the line of its
+    # detached spine is invisible.  First, activate the frame but make the patch
+    # and spines invisible.
+    make_patch_spines_invisible(par2)
+    # Second, show the right spine.
+    par2.spines["right"].set_visible(True)
+
+    p1, = host.plot([0, 1, 2], [0, 1, 2], "b-")
+    p2, = par1.plot([0, 1, 2], [0, 3, 2], "r-")
+    p3, = par2.plot([0, 1, 2], [50, 30, 15], "g-")
+
+    host.set_xlim(0, 2)
+    host.set_ylim(0, 2)
+    par1.set_ylim(0, 4)
+    par2.set_ylim(1, 65)
+
+    host.yaxis.label.set_color(p1.get_color())
+    par1.yaxis.label.set_color(p2.get_color())
+    par2.yaxis.label.set_color(p3.get_color())
+
+    tkw = dict(size=4, width=1.5)
+    host.tick_params(axis='y', colors=p1.get_color(), **tkw)
+    par1.tick_params(axis='y', colors=p2.get_color(), **tkw)
+    par2.tick_params(axis='y', colors=p3.get_color(), **tkw)
+    host.tick_params(axis='x', **tkw)
+
+
 if __name__ == '__main__':
     import nose
     nose.runmodule(argv=['-s', '--with-doctest'], exit=False)

lib/matplotlib/tests/test_axes.py

@@ -128,6 +128,7 @@ point_in_path_impl(const void* const points_, const size_t s0,
                    npy_bool* const inside_flag)
 {
     int *yflag0;
+    int *subpath_flag;
     int yflag1;
     double vtx0, vty0, vtx1, vty1;
     double tx, ty;
@@ -138,6 +139,7 @@ point_in_path_impl(const void* const points_, const size_t s0,
     const char *const points = (const char * const)points_;
 
     yflag0 = (int *)malloc(n * sizeof(int));
+    subpath_flag = (int *)malloc(n * sizeof(int));
 
     path.rewind(0);
 
@@ -151,6 +153,10 @@ point_in_path_impl(const void* const points_, const size_t s0,
         if (code != agg::path_cmd_move_to)
         {
             code = path.vertex(&x, &y);
+            if (code == agg::path_cmd_stop ||
+                (code & agg::path_cmd_end_poly) == agg::path_cmd_end_poly) {
+                continue;
+            }
         }
 
         sx = vtx0 = vtx1 = x;
@@ -162,7 +168,7 @@ point_in_path_impl(const void* const points_, const size_t s0,
             // get test bit for above/below X axis
             yflag0[i] = (vty0 >= ty);
 
-            inside_flag[i] = 0;
+            subpath_flag[i] = 0;
         }
 
         do
@@ -208,7 +214,7 @@ point_in_path_impl(const void* const points_, const size_t s0,
                     // tests.
                     if (((vty1 - ty) * (vtx0 - vtx1) >=
                          (vtx1 - tx) * (vty0 - vty1)) == yflag1) {
-                        inside_flag[i] ^= 1;
+                        subpath_flag[i] ^= 1;
                     }
                 }
 
@@ -235,10 +241,10 @@ point_in_path_impl(const void* const points_, const size_t s0,
             if (yflag0[i] != yflag1) {
                 if (((vty1 - ty) * (vtx0 - vtx1) >=
                      (vtx1 - tx) * (vty0 - vty1)) == yflag1) {
-                    inside_flag[i] ^= 1;
+                    subpath_flag[i] ^= 1;
                 }
             }
-
+            inside_flag[i] |= subpath_flag[i];
             if (inside_flag[i] == 0) {
                 all_done = 0;
             }
@@ -253,6 +259,7 @@ point_in_path_impl(const void* const points_, const size_t s0,
  exit:
 
     free(yflag0);
+    free(subpath_flag);
 }
 
 inline void
@@ -699,7 +706,7 @@ _path_module::get_path_collection_extents(const Py::Tuple& args)
 Py::Object
 _path_module::point_in_path_collection(const Py::Tuple& args)
 {
-    args.verify_length(9);
+    args.verify_length(10);
 
     //segments, trans, clipbox, colors, linewidths, antialiaseds
     double                  x                = Py::Float(args[0]);
@@ -711,6 +718,9 @@ _path_module::point_in_path_collection(const Py::Tuple& args)
     Py::SeqBase<Py::Object> offsets_obj      = args[6];
     agg::trans_affine       offset_trans     = py_to_agg_transformation_matrix(args[7].ptr());
     bool                    filled           = Py::Boolean(args[8]);
+    std::string             offset_position  = Py::String(args[9]);
+
+    bool data_offsets = (offset_position == "data");
 
     PyArrayObject* offsets = (PyArrayObject*)PyArray_FromObject(
         offsets_obj.ptr(), PyArray_DOUBLE, 0, 2);
@@ -761,7 +771,11 @@ _path_module::point_in_path_collection(const Py::Tuple& args)
             double xo = *(double*)PyArray_GETPTR2(offsets, i % Noffsets, 0);
             double yo = *(double*)PyArray_GETPTR2(offsets, i % Noffsets, 1);
             offset_trans.transform(&xo, &yo);
-            trans *= agg::trans_affine_translation(xo, yo);
+            if (data_offsets) {
+                trans = agg::trans_affine_translation(xo, yo) * trans;
+            } else {
+                trans *= agg::trans_affine_translation(xo, yo);
+            }
         }
 
         if (filled)