Merge branch 'v1.2.x'

Conflicts:
	lib/matplotlib/cbook.py

Author: dmcdougall

test/TODO renamed to TODO_TESTS

@@ -14,6 +14,15 @@ For new features that were added to matplotlib, please see
 Changes in 1.2.x
 ================
 
+* The :meth:`~matplotlib.cbook.isvector` method has been removed since it
+  is no longer functional.
+
+* The `rasterization_zorder` property on `~matplotlib.axes.Axes` a
+  zorder below which artists are rasterized.  This has defaulted to
+  -30000.0, but it now defaults to `None`, meaning no artists will be
+  rasterized.  In order to rasterize artists below a given zorder
+  value, `set_rasterization_zorder` must be explicitly called.
+
 * In :meth:`~matplotlib.axes.Axes.scatter`, and `~pyplot.scatter`,
   when specifying a marker using a tuple, the angle is now specified
   in degrees, not radians.
@@ -90,14 +99,14 @@ Changes in 1.2.x
          def transform(self, xy):
              ...
          transform_non_affine = transform
-  
-  
+
+
   This approach will no longer function correctly and should be changed to::
 
      class MyTransform(mtrans.Transform):
          def transform_non_affine(self, xy):
              ...
-  
+
 
 * Artists no longer have ``x_isdata`` or ``y_isdata`` attributes; instead
   any artist's transform can be interrogated with
@@ -115,7 +124,7 @@ Changes in 1.2.x
       Bbox('array([[  0.,   0.],\n       [ 90.,  90.]])')
 
 * One can now easily get a transform which goes from one transform's coordinate
-  system to another, in an optimized way, using the new subtract method on a 
+  system to another, in an optimized way, using the new subtract method on a
   transform. For instance, to go from data coordinates to axes coordinates::
 
       >>> import matplotlib.pyplot as plt
@@ -126,8 +135,8 @@ Changes in 1.2.x
       >>> print(data2ax.depth)
       2
 
-  for versions before 1.2 this could only be achieved in a sub-optimal way, 
-  using ``ax.transData + ax.transAxes.inverted()`` (depth is a new concept, 
+  for versions before 1.2 this could only be achieved in a sub-optimal way,
+  using ``ax.transData + ax.transAxes.inverted()`` (depth is a new concept,
   but had it existed it would return 4 for this example).
 
 * ``twinx`` and ``twiny`` now returns an instance of SubplotBase if
@@ -141,8 +150,8 @@ Changes in 1.2.x
 * :class:`~matplotlib.colors.ColorConverter`,
   :class:`~matplotlib.colors.Colormap` and
   :class:`~matplotlib.colors.Normalize` now subclasses ``object``
-  
-* ContourSet instances no longer have a ``transform`` attribute. Instead, 
+
+* ContourSet instances no longer have a ``transform`` attribute. Instead,
   access the transform with the ``get_transform`` method.
 
 Changes in 1.1.x

doc/api/api_changes.rst

@@ -112,37 +112,37 @@ unicode handling must be configured in the preamble.
 
 .. image:: /_static/pgf_texsystem.*
 
-.. _pgf-hangups:
 
-Possible hangups
-================
+.. _pgf-troubleshooting:
+
+Troubleshooting
+===============
 
 * Please note that the TeX packages found in some Linux distributions and
   MiKTeX installations are dramatically outdated. Make sure to update your
-  package catalog and upgrade or install a recent TeX distribution before
-  reporting problems.
+  package catalog and upgrade or install a recent TeX distribution.
 
 * On Windows, the :envvar:`PATH` environment variable may need to be modified
   to include the directories containing the latex, dvipng and ghostscript
   executables. See :ref:`environment-variables` and
   :ref:`setting-windows-environment-variables` for details.
 
+* A limitation on Windows causes the backend to keep file handles that have
+  been opened by your application open. As a result, it may not be possible
+  to delete the corresponding files until the application closes (see
+  `#1324 <https://github.com/matplotlib/matplotlib/issues/1324>`_).
+
 * Sometimes the font rendering in figures that are saved to png images is
   very bad. This happens when the pdftocairo tool is not available and
   ghostscript is used for the pdf to png conversion.
 
-.. _pgf-troubleshooting:
-
-Troubleshooting
-===============
-
 * Make sure what you are trying to do is possible in a LaTeX document,
   that your LaTeX syntax is valid and that you are using raw strings
   if necessary to avoid unintended escape sequences.
 
 * The ``pgf.preamble`` rc setting provides lots of flexibility, and lots of
   ways to cause problems. When experiencing problems, try to minimalize or
-  disable the custom preamble before reporting problems.
+  disable the custom preamble.
 
 * If you still need help, please see :ref:`reporting-problems`
 

doc/users/pgf.rst

@@ -1078,11 +1078,13 @@ def tk_window_focus():
     'matplotlib.tests.test_scale',
     'matplotlib.tests.test_simplification',
     'matplotlib.tests.test_spines',
+    'matplotlib.tests.test_subplots',
     'matplotlib.tests.test_text',
     'matplotlib.tests.test_ticker',
     'matplotlib.tests.test_tightlayout',
     'matplotlib.tests.test_triangulation',
     'matplotlib.tests.test_transforms',
+    'matplotlib.tests.test_arrow_patches',
     ]
 
 

lib/matplotlib/__init__.py

@@ -16,7 +16,7 @@
 import matplotlib.collections as mcoll
 import matplotlib.colors as mcolors
 import matplotlib.contour as mcontour
-import matplotlib.dates as _ # <-registers a date unit converter 
+import matplotlib.dates as _ # <-registers a date unit converter
 from matplotlib import docstring
 import matplotlib.font_manager as font_manager
 import matplotlib.image as mimage
@@ -465,7 +465,7 @@ def __init__(self, fig, rect,
         self._frameon = frameon
         self._axisbelow = rcParams['axes.axisbelow']
 
-        self._rasterization_zorder = -30000
+        self._rasterization_zorder = None
 
         self._hold = rcParams['axes.hold']
         self._connected = {} # a dict from events to (id, func)
@@ -1852,7 +1852,9 @@ def margins(self, *args, **kw):
 
     def set_rasterization_zorder(self, z):
         """
-        Set zorder value below which artists will be rasterized
+        Set zorder value below which artists will be rasterized.  Set
+        to `None` to disable rasterizing of artists below a particular
+        zorder.
         """
         self._rasterization_zorder = z
 
@@ -2029,7 +2031,8 @@ def draw(self, renderer=None, inframe=False):
         # rasterize artists with negative zorder
         # if the minimum zorder is negative, start rasterization
         rasterization_zorder = self._rasterization_zorder
-        if len(dsu) > 0 and dsu[0][0] < rasterization_zorder:
+        if (rasterization_zorder is not None and
+            len(dsu) > 0 and dsu[0][0] < rasterization_zorder):
             renderer.start_rasterizing()
             dsu_rasterized = [l for l in dsu if l[0] < rasterization_zorder]
             dsu = [l for l in dsu if l[0] >= rasterization_zorder]
@@ -3972,7 +3975,7 @@ def plot(self, *args, **kwargs):
 
             plot(x, y, color='green', linestyle='dashed', marker='o',
                  markerfacecolor='blue', markersize=12).
-                 
+
         See :class:`~matplotlib.lines.Line2D` for details.
 
         The kwargs are :class:`~matplotlib.lines.Line2D` properties:
@@ -7073,7 +7076,7 @@ def imshow(self, X, cmap=None, norm=None, aspect=None,
         **Example:**
 
         .. plot:: mpl_examples/pylab_examples/image_demo.py
-        
+
         """
 
         if not self._hold: self.cla()
@@ -7139,6 +7142,10 @@ def pcolor(self, *args, **kwargs):
         """
         Create a pseudocolor plot of a 2-D array.
 
+        Note: pcolor can be very slow for large arrays; consider
+        using the similar but much faster
+        :func:`~matplotlib.pyplot.pcolormesh` instead.
+
         Call signatures::
 
           pcolor(C, **kwargs)
@@ -7269,6 +7276,11 @@ def pcolor(self, *args, **kwargs):
         Stroking the edges may be preferred if *alpha* is 1, but
         will cause artifacts otherwise.
 
+        .. seealso::
+
+            :func:`~matplotlib.pyplot.pcolormesh`
+                For an explanation of the differences between
+                pcolor and pcolormesh.
         """
 
         if not self._hold: self.cla()
@@ -7418,7 +7430,7 @@ def pcolormesh(self, *args, **kwargs):
 
             If ``'None'``, edges will not be visible.
 
-            If ``'face'``, edges will have the same color as the faces. 
+            If ``'face'``, edges will have the same color as the faces.
 
             An mpl color or sequence of colors will set the edge color
 
@@ -7495,23 +7507,25 @@ def pcolorfast(self, *args, **kwargs):
         """
         pseudocolor plot of a 2-D array
 
-        Experimental; this is a version of pcolor that
-        does not draw lines, that provides the fastest
-        possible rendering with the Agg backend, and that
-        can handle any quadrilateral grid.
+        Experimental; this is a pcolor-type method that
+        provides the fastest possible rendering with the Agg
+        backend, and that can handle any quadrilateral grid.
+        It supports only flat shading (no outlines), it lacks
+        support for log scaling of the axes, and it does not
+        have a pyplot wrapper.
 
         Call signatures::
 
-          pcolor(C, **kwargs)
-          pcolor(xr, yr, C, **kwargs)
-          pcolor(x, y, C, **kwargs)
-          pcolor(X, Y, C, **kwargs)
+          ax.pcolorfast(C, **kwargs)
+          ax.pcolorfast(xr, yr, C, **kwargs)
+          ax.pcolorfast(x, y, C, **kwargs)
+          ax.pcolorfast(X, Y, C, **kwargs)
 
         C is the 2D array of color values corresponding to quadrilateral
         cells. Let (nr, nc) be its shape.  C may be a masked array.
 
-        ``pcolor(C, **kwargs)`` is equivalent to
-        ``pcolor([0,nc], [0,nr], C, **kwargs)``
+        ``ax.pcolorfast(C, **kwargs)`` is equivalent to
+        ``ax.pcolorfast([0,nc], [0,nr], C, **kwargs)``
 
         *xr*, *yr* specify the ranges of *x* and *y* corresponding to the
         rectangular region bounding *C*.  If::