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

Author: dmcdougall

doc/api/api_changes.rst

@@ -22,6 +22,9 @@ Changes in 1.3.x
 Changes in 1.2.x
 ================
 
+* The ``classic`` option of the rc parameter ``toolbar`` is deprecated
+  and will be removed in the next release.
+
 * The :meth:`~matplotlib.cbook.isvector` method has been removed since it
   is no longer functional.
 

doc/faq/troubleshooting_faq.rst

@@ -62,14 +62,22 @@ environment variable -- see
 
 .. _reporting-problems:
 
-Report a problem
-================
+Getting help
+============
 
-If you are having a problem with matplotlib, search the mailing
-lists first: there's a good chance someone else has already run into
-your problem.
+There are a number of good resources for getting help with matplotlib.
+There is a good chance your question has already been asked:
 
-If not, please provide the following information in your e-mail to the
+  - The `mailing list
+    <http://sourceforge.net/search/?group_id=80706&type_of_search=mlists>`_.
+
+  - `Github issues <https://github.com/matplotlib/matplotlib/issues>`_.
+
+  - Stackoverflow questions tagged `matplotlib
+<http://stackoverflow.com/questions/tagged/matplotlib>`_.
+
+If you are unable to find an answer to your question through search,
+please provide the following information in your e-mail to the
 `mailing list
 <http://lists.sourceforge.net/mailman/listinfo/matplotlib-users>`_:
 

lib/matplotlib/axes.py

@@ -2205,7 +2205,7 @@ def ticklabel_format(self, **kwargs):
           *scilimits*    (m, n), pair of integers; if *style*
                          is 'sci', scientific notation will
                          be used for numbers outside the range
-                         10`-m`:sup: to 10`n`:sup:.
+                         10`m`:sup: to 10`n`:sup:.
                          Use (0,0) to include all numbers.
           *useOffset*    [True | False | offset]; if True,
                          the offset will be calculated as needed;
@@ -7364,6 +7364,20 @@ def pcolor(self, *args, **kwargs):
 
         x = X.compressed()
         y = Y.compressed()
+        
+        # Transform from native to data coordinates?
+        t = collection._transform
+        if (not isinstance(t, mtransforms.Transform)
+            and hasattr(t, '_as_mpl_transform')):
+            t = t._as_mpl_transform(self.axes)
+        
+        if t and any(t.contains_branch_seperately(self.transData)):
+            trans_to_data = t - self.transData
+            pts = np.vstack([x, y]).T.astype(np.float)
+            transformed_pts = trans_to_data.transform(pts)
+            x = transformed_pts[..., 0]
+            y = transformed_pts[..., 1]
+
         minx = np.amin(x)
         maxx = np.amax(x)
         miny = np.amin(y)
@@ -7490,6 +7504,19 @@ def pcolormesh(self, *args, **kwargs):
         collection.autoscale_None()
 
         self.grid(False)
+        
+        # Transform from native to data coordinates?
+        t = collection._transform
+        if (not isinstance(t, mtransforms.Transform)
+            and hasattr(t, '_as_mpl_transform')):
+            t = t._as_mpl_transform(self.axes)
+        
+        if t and any(t.contains_branch_seperately(self.transData)):
+            trans_to_data = t - self.transData
+            pts = np.vstack([X, Y]).T.astype(np.float)
+            transformed_pts = trans_to_data.transform(pts)
+            X = transformed_pts[..., 0]
+            Y = transformed_pts[..., 1]
 
         minx = np.amin(X)
         maxx = np.amax(X)
@@ -8072,7 +8099,7 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
             # so that each histogram uses the same bins
             m, bins = np.histogram(x[i], bins, weights=w[i], **hist_kwargs)
             if mlast is None:
-                mlast = np.zeros(len(bins)-1, np.int)
+                mlast = np.zeros(len(bins)-1, m.dtype)
             if normed:
                 db = np.diff(bins)
                 m = (m.astype(float) / db) / m.sum()

lib/matplotlib/backends/backend_qt4.py

@@ -603,8 +603,7 @@ def set_message( self, s ):
 
     def set_cursor( self, cursor ):
         if DEBUG: print('Set cursor' , cursor)
-        QtGui.QApplication.restoreOverrideCursor()
-        QtGui.QApplication.setOverrideCursor( QtGui.QCursor( cursord[cursor] ) )
+        self.canvas.manager.window.setCursor(cursord[cursor])
 
     def draw_rubberband( self, event, x0, y0, x1, y1 ):
         height = self.canvas.figure.bbox.height

lib/matplotlib/backends/backend_qt4agg.py

@@ -4,6 +4,7 @@
 from __future__ import division, print_function
 
 import os, sys
+import ctypes
 
 import matplotlib
 from matplotlib.figure import Figure
@@ -15,6 +16,10 @@
 
 DEBUG = False
 
+_decref = ctypes.pythonapi.Py_DecRef
+_decref.argtypes = [ctypes.py_object]
+_decref.restype = None
+
 
 def new_figure_manager( num, *args, **kwargs ):
     """
@@ -95,6 +100,8 @@ def paintEvent( self, e ):
             else:
                 stringBuffer = self.renderer._renderer.tostring_argb()
 
+            refcnt = sys.getrefcount(stringBuffer)
+
             qImage = QtGui.QImage(stringBuffer, self.renderer.width,
                                   self.renderer.height,
                                   QtGui.QImage.Format_ARGB32)
@@ -106,6 +113,14 @@ def paintEvent( self, e ):
                 p.setPen( QtGui.QPen( QtCore.Qt.black, 1, QtCore.Qt.DotLine ) )
                 p.drawRect( self.rect[0], self.rect[1], self.rect[2], self.rect[3] )
             p.end()
+
+            # This works around a bug in PySide 1.1.2 on Python 3.x,
+            # where the reference count of stringBuffer is incremented
+            # but never decremented by QImage.
+            # TODO: revert PR #1323 once the issue is fixed in PySide.
+            del qImage
+            if refcnt != sys.getrefcount(stringBuffer):
+                _decref(stringBuffer)
         else:
             bbox = self.blitbox
             l, b, r, t = bbox.extents

lib/matplotlib/backends/backend_svg.py

@@ -1095,6 +1095,8 @@ def print_svg(self, filename, *args, **kwargs):
                     svgwriter = io.TextIOWrapper(filename, 'utf-8')
                 else:
                     svgwriter = codecs.getwriter('utf-8')(filename)
+            else:
+                svgwriter = filename
             fh_to_close = None
         else:
             raise ValueError("filename must be a path or a file-like object")

lib/matplotlib/pyplot.py

@@ -2654,7 +2654,7 @@ def hist(x, bins=10, range=None, normed=False, weights=None, cumulative=False,
                       weights=weights, cumulative=cumulative, bottom=bottom,
                       histtype=histtype, align=align, orientation=orientation,
                       rwidth=rwidth, log=log, color=color, label=label,
-                      **kwargs)
+                      stacked=stacked, **kwargs)
         draw_if_interactive()
     finally:
         ax.hold(washold)

lib/matplotlib/rcsetup.py

@@ -110,9 +110,17 @@ def validate_backend(s):
 
 validate_qt4 = ValidateInStrings('backend.qt4', ['PyQt4', 'PySide'])
 
-validate_toolbar = ValidateInStrings('toolbar',[
-    'None','classic','toolbar2',
-    ], ignorecase=True)
+def validate_toolbar(s):
+    validator = ValidateInStrings(
+                'toolbar',
+                ['None','classic','toolbar2'],
+                ignorecase=True)
+    s = validator(s)
+    if s.lower == 'classic':
+        warnings.warn("'classic' Navigation Toolbar "
+                      "is deprecated in v1.2.x and will be "
+                      "removed in v1.3")
+    return s
 
 def validate_maskedarray(v):
     # 2008/12/12: start warning; later, remove all traces of maskedarray

lib/matplotlib/table.py

@@ -267,8 +267,7 @@ def contains(self, mouseevent):
             boxes = [self._cells[pos].get_window_extent(self._cachedRenderer)
                  for pos in self._cells.iterkeys()
                  if pos[0] >= 0 and pos[1] >= 0]
-            # FIXME bbox_all is not defined.
-            bbox = bbox_all(boxes)
+            bbox = Bbox.union(boxes)
             return bbox.contains(mouseevent.x, mouseevent.y), {}
         else:
             return False, {}
@@ -281,8 +280,7 @@ def get_children(self):
     def get_window_extent(self, renderer):
         'Return the bounding box of the table in window coords'
         boxes = [c.get_window_extent(renderer) for c in self._cells]
-        # FIXME bbox_all is not defined
-        return bbox_all(boxes)
+        return Bbox.union(boxes)
 
     def _do_cell_alignment(self):
         """ Calculate row heights and column widths.