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

Conflicts:
	lib/matplotlib/tests/baseline_images/test_axes/polar_axes.pdf
	lib/matplotlib/tests/baseline_images/test_axes/polar_axes.png
	lib/matplotlib/tests/baseline_images/test_axes/polar_axes.svg
	lib/matplotlib/tests/baseline_images/test_axes/single_point.pdf
	lib/matplotlib/tests/baseline_images/test_axes/single_point.png
	lib/matplotlib/tests/baseline_images/test_axes/single_point.svg
	lib/matplotlib/tests/test_axes.py
	src/_backend_agg.cpp

Author: mdboom

examples/api/custom_scale_example.py

@@ -110,7 +110,7 @@ def __init__(self, thresh):
             mtransforms.Transform.__init__(self)
             self.thresh = thresh
 
-        def transform(self, a):
+        def transform_non_affine(self, a):
             """
             This transform takes an Nx1 ``numpy`` array and returns a
             transformed copy.  Since the range of the Mercator scale
@@ -144,7 +144,7 @@ def __init__(self, thresh):
             mtransforms.Transform.__init__(self)
             self.thresh = thresh
 
-        def transform(self, a):
+        def transform_non_affine(self, a):
             return np.arctan(np.sinh(a))
 
         def inverted(self):

lib/matplotlib/axis.py

@@ -413,6 +413,7 @@ def _get_gridline(self):
                    linestyle=rcParams['grid.linestyle'],
                    linewidth=rcParams['grid.linewidth'],
                    alpha=rcParams['grid.alpha'],
+                   markersize=0
                    )
         l.set_transform(self.axes.get_xaxis_transform(which='grid'))
         l.get_path()._interpolation_steps = GRIDLINE_INTERPOLATION_STEPS
@@ -551,6 +552,7 @@ def _get_gridline(self):
                     linestyle=rcParams['grid.linestyle'],
                     linewidth=rcParams['grid.linewidth'],
                     alpha=rcParams['grid.alpha'],
+                    markersize=0
                     )
 
         l.set_transform(self.axes.get_yaxis_transform(which='grid'))

lib/matplotlib/backend_bases.py

@@ -383,6 +383,8 @@ def _iter_collection(self, gc, master_transform, all_transforms,
                     xp, yp = transform.transform_point((0, 0))
                     xo = -(xp - xo)
                     yo = -(yp - yo)
+            if not (np.isfinite(xo) and np.isfinite(yo)):
+                continue
             if Nfacecolors:
                 rgbFace = facecolors[i % Nfacecolors]
             if Nedgecolors:

lib/matplotlib/markers.py

@@ -221,7 +221,7 @@ def set_marker(self, marker):
             self._marker_function = self._set_tuple_marker
         elif isinstance(marker, np.ndarray):
             self._marker_function = self._set_vertices
-        elif marker in self.markers:
+        elif not isinstance(marker, list) and marker in self.markers:
             self._marker_function = getattr(
                 self, '_set_' + self.markers[marker])
         elif is_string_like(marker) and is_math_text(marker):