Merge remote branch 'upstream/v1.3.x'

* upstream/v1.3.x:
  Update version to 1.3.1
  tiny correction of matplotlibrc.template
  minor docstring fix in dates.py
  Updated the docs of pyplot.gca.
  Fix matplotlib#2472: Draw the spines on top of twin axes
  changes to c++ because gcc 4.8 seems to allow things the compiler on travis will not.
  added class variable `_fill_color` to RendererAgg to hold the color to use in `clear` calls to the render_base.
  patch to fix issue matplotlib#2473.

Conflicts:
	lib/matplotlib/__init__.py
	lib/matplotlib/axes/_axes.py

Author: pelson

lib/matplotlib/axes/_base.py

@@ -3239,13 +3239,13 @@ def twinx(self):
             For those who are 'picking' artists while using twinx, pick
             events are only called for the artists in the top-most axes.
         """
-
-        ax2 = self._make_twin_axes(sharex=self, frameon=False)
+        ax2 = self._make_twin_axes(sharex=self)
         ax2.yaxis.tick_right()
         ax2.yaxis.set_label_position('right')
         ax2.yaxis.set_offset_position('right')
         self.yaxis.tick_left()
         ax2.xaxis.set_visible(False)
+        ax2.patch.set_visible(False)
         return ax2
 
     def twiny(self):
@@ -3264,11 +3264,12 @@ def twiny(self):
             events are only called for the artists in the top-most axes.
         """
 
-        ax2 = self._make_twin_axes(sharey=self, frameon=False)
+        ax2 = self._make_twin_axes(sharey=self)
         ax2.xaxis.tick_top()
         ax2.xaxis.set_label_position('top')
         self.xaxis.tick_bottom()
         ax2.yaxis.set_visible(False)
+        ax2.patch.set_visible(False)
         return ax2
 
     def get_shared_x_axes(self):

lib/matplotlib/dates.py

@@ -495,7 +495,7 @@ class AutoDateFormatter(ticker.Formatter):
            365.0  : '%Y',
            30.    : '%b %Y',
            1.0    : '%b %d %Y',
-           1./24. : '%H:%M:%D',
+           1./24. : '%H:%M:%S',
            1. / (24. * 60.): '%H:%M:%S.%f',
            }
 

lib/matplotlib/pyplot.py

@@ -792,22 +792,22 @@ def sca(ax):
 
 def gca(**kwargs):
     """
-    Return the current axis instance.  This can be used to control
-    axis properties either using set or the
-    :class:`~matplotlib.axes.Axes` methods, for example, setting the
-    xaxis range::
-
-      plot(t,s)
-      set(gca(), 'xlim', [0,10])
-
-    or::
-
-      plot(t,s)
-      a = gca()
-      a.set_xlim([0,10])
-
+    Return the current :class:`~matplotlib.axes.Axes` instance on the
+    current figure matching the given keyword args, or create one.
+    
+    Examples
+    ---------
+    To get the the current polar axes on the current figure::
+    
+        plt.gca(projection='polar')
+    
+    If the current axes doesn't exist, or isn't a polar one, the appropriate
+    axes will be created and then returned.
+    
+    See Also
+    --------
+    matplotlib.figure.Figure.gca : The figure's gca method.
     """
-
     ax =  gcf().gca(**kwargs)
     return ax
 

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

@@ -2341,6 +2341,27 @@ def make_patch_spines_invisible(ax):
     host.tick_params(axis='x', **tkw)
 
 
+@image_comparison(baseline_images=['twin_spines_on_top'], extensions=['png'],
+                  remove_text=True)
+def test_twin_spines_on_top():
+    matplotlib.rcParams['axes.linewidth'] = 48.0
+    matplotlib.rcParams['lines.linewidth'] = 48.0
+
+    fig = plt.figure()
+    ax1 = fig.add_subplot(1, 1, 1)
+
+    data = np.array([[1000, 1100, 1200, 1250],
+                     [310, 301, 360, 400]])
+
+    ax2 = ax1.twinx()
+
+    ax1.plot(data[0], data[1]/1E3, color='#BEAED4')
+    ax1.fill_between(data[0], data[1]/1E3, color='#BEAED4', alpha=.8)
+
+    ax2.plot(data[0], data[1]/1E3, color='#7FC97F')
+    ax2.fill_between(data[0], data[1]/1E3, color='#7FC97F', alpha=.5)
+
+
 @cleanup
 def test_rcparam_grid_minor():
     orig_grid = matplotlib.rcParams['axes.grid']

lib/matplotlib/tests/test_axes.py

@@ -151,7 +151,8 @@ def test_imsave_color_alpha():
     # Wherever alpha values were rounded down to 0, the rgb values all get set
     # to 0 during imsave (this is reasonable behaviour).
     # Recreate that here:
-    data[data[:, :, 3] == 0] = 0
+    for j in range(3):
+        data[data[:, :, 3] == 0, j] = 1
 
     assert_array_equal(data, arr_buf)
 

lib/matplotlib/tests/test_image.py

@@ -181,7 +181,7 @@ backend      : %(backend)s
                              # correction off.  None will try and
                              # guess based on your dvipng version
 
-#text.hinting : 'auto' # May be one of the following:
+#text.hinting : auto   # May be one of the following:
                        #   'none': Perform no hinting
                        #   'auto': Use freetype's autohinter
                        #   'native': Use the hinting information in the

matplotlibrc.template

@@ -421,7 +421,8 @@ RendererAgg::RendererAgg(unsigned int width, unsigned int height, double dpi,
     rendererAA(),
     rendererBin(),
     theRasterizer(),
-    debug(debug)
+    debug(debug),
+    _fill_color(agg::rgba(1, 1, 1, 0))
 {
     _VERBOSE("RendererAgg::RendererAgg");
     unsigned stride(width*4);
@@ -430,7 +431,7 @@ RendererAgg::RendererAgg(unsigned int width, unsigned int height, double dpi,
     renderingBuffer.attach(pixBuffer, width, height, stride);
     pixFmt.attach(renderingBuffer);
     rendererBase.attach(pixFmt);
-    rendererBase.clear(agg::rgba(0, 0, 0, 0));
+    rendererBase.clear(_fill_color);
     rendererAA.attach(rendererBase);
     rendererBin.attach(rendererBase);
     hatchRenderingBuffer.attach(hatchBuffer, HATCH_SIZE, HATCH_SIZE,
@@ -1285,7 +1286,7 @@ void RendererAgg::_draw_path(path_t& path, bool has_clippath,
         pixfmt hatch_img_pixf(hatchRenderingBuffer);
         renderer_base rb(hatch_img_pixf);
         renderer_aa rs(rb);
-        rb.clear(agg::rgba(0.0, 0.0, 0.0, 0.0));
+        rb.clear(_fill_color);
         rs.color(gc.color);
 
         try {
@@ -2441,7 +2442,7 @@ RendererAgg::clear(const Py::Tuple& args)
     _VERBOSE("RendererAgg::clear");
 
     args.verify_length(0);
-    rendererBase.clear(agg::rgba(0, 0, 0, 0));
+    rendererBase.clear(_fill_color);
 
     return Py::Object();
 }

src/_backend_agg.cpp

@@ -241,6 +241,9 @@ class RendererAgg: public Py::PythonExtension<RendererAgg>
 
     const int debug;
 
+    agg::rgba _fill_color;
+
+
 protected:
     double points_to_pixels(const Py::Object& points);
     agg::rgba rgb_to_color(const Py::SeqBase<Py::Object>& rgb, double alpha);