Merge branch 'v1.2.x' of github.com:matplotlib/matplotlib

* 'v1.2.x' of github.com:matplotlib/matplotlib:
  Alternative to matplotlib#1404. Sets the cursor without refering to a FigureManager
  Update version numbers
  Exception message improvement.
  Fixed transform=None behaviour on Artists.
  Add trove classifiers to setup.py
  Fix AttrituteError for .lower on tuple of strings
  Tables: Fix get_window_extent for table to allow table to be added to bbox_extra_artists. The get_window_extent is a method on the cells not the key of the cells.

Conflicts:
	lib/matplotlib/__init__.py

Author: pelson

LICENSE/LICENSE

@@ -1,4 +1,4 @@
-LICENSE AGREEMENT FOR MATPLOTLIB 1.1.0
+LICENSE AGREEMENT FOR MATPLOTLIB 1.2.0
 --------------------------------------
 
 1. This LICENSE AGREEMENT is between John D. Hunter ("JDH"), and the
@@ -9,30 +9,30 @@ documentation.
 2. Subject to the terms and conditions of this License Agreement, JDH
 hereby grants Licensee a nonexclusive, royalty-free, world-wide license
 to reproduce, analyze, test, perform and/or display publicly, prepare
-derivative works, distribute, and otherwise use matplotlib 1.1.0
+derivative works, distribute, and otherwise use matplotlib 1.2.0
 alone or in any derivative version, provided, however, that JDH's
 License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
 2002-2011 John D. Hunter; All Rights Reserved" are retained in
-matplotlib 1.1.0 alone or in any derivative version prepared by
+matplotlib 1.2.0 alone or in any derivative version prepared by
 Licensee.
 
 3. In the event Licensee prepares a derivative work that is based on or
-incorporates matplotlib 1.1.0 or any part thereof, and wants to
+incorporates matplotlib 1.2.0 or any part thereof, and wants to
 make the derivative work available to others as provided herein, then
 Licensee hereby agrees to include in any such work a brief summary of
-the changes made to matplotlib 1.1.0.
+the changes made to matplotlib 1.2.0.
 
-4. JDH is making matplotlib 1.1.0 available to Licensee on an "AS
+4. JDH is making matplotlib 1.2.0 available to Licensee on an "AS
 IS" basis.  JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
 IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND
 DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 1.1.0
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 1.2.0
 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
 
 5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB
-1.1.0 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
+1.2.0 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
 LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
-MATPLOTLIB 1.1.0, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
+MATPLOTLIB 1.2.0, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
 THE POSSIBILITY THEREOF.
 
 6. This License Agreement will automatically terminate upon a material
@@ -44,6 +44,6 @@ Licensee.  This License Agreement does not grant permission to use JDH
 trademarks or trade name in a trademark sense to endorse or promote
 products or services of Licensee, or any third party.
 
-8. By copying, installing or otherwise using matplotlib 1.1.0,
+8. By copying, installing or otherwise using matplotlib 1.2.0,
 Licensee agrees to be bound by the terms and conditions of this License
 Agreement.

lib/matplotlib/__init__.py

@@ -1066,6 +1066,7 @@ def tk_window_focus():
 
 default_test_modules = [
     'matplotlib.tests.test_agg',
+    'matplotlib.tests.test_artist',
     'matplotlib.tests.test_axes',
     'matplotlib.tests.test_backend_svg',
     'matplotlib.tests.test_backend_pgf',

lib/matplotlib/artist.py

@@ -231,7 +231,7 @@ def set_transform(self, t):
         ACCEPTS: :class:`~matplotlib.transforms.Transform` instance
         """
         self._transform = t
-        self._transformSet = t is not None
+        self._transformSet = True
         self.pchanged()
 
     def get_transform(self):
@@ -240,7 +240,7 @@ def get_transform(self):
         instance used by this artist.
         """
         if self._transform is None:
-            self._transform = IdentityTransform()
+            self.set_transform(IdentityTransform())
         elif (not isinstance(self._transform, Transform)
               and hasattr(self._transform, '_as_mpl_transform')):
             self._transform = self._transform._as_mpl_transform(self.axes)
@@ -663,6 +663,7 @@ def update(self, props):
         store = self.eventson
         self.eventson = False
         changed = False
+            
         for k, v in props.iteritems():
             func = getattr(self, 'set_' + k, None)
             if func is None or not callable(func):

lib/matplotlib/axes.py

@@ -1120,7 +1120,7 @@ def set_anchor(self, anchor):
             self._anchor = anchor
         else:
             raise ValueError('argument must be among %s' %
-                                ', '.join(mtransforms.BBox.coefs.keys()))
+                                ', '.join(mtransforms.Bbox.coefs.keys()))
 
     def get_data_ratio(self):
         """
@@ -7347,8 +7347,9 @@ def pcolor(self, *args, **kwargs):
         # makes artifacts that are often disturbing.
         if 'antialiased' in kwargs:
             kwargs['antialiaseds'] = kwargs.pop('antialiased')
-        if 'antialiaseds' not in kwargs and ec.lower() == "none":
-                kwargs['antialiaseds'] = False
+        if 'antialiaseds' not in kwargs and (is_string_like(ec) and
+                ec.lower() == "none"):
+            kwargs['antialiaseds'] = False
 
 
         collection = mcoll.PolyCollection(verts, **kwargs)

lib/matplotlib/backends/backend_qt4.py

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

lib/matplotlib/streamplot.py

@@ -65,6 +65,10 @@ def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,
     mask = StreamMask(density)
     dmap = DomainMap(grid, mask)
 
+    # default to data coordinates
+    if transform is None:
+        transform = axes.transData
+
     if color is None:
         color = axes._get_lines.color_cycle.next()
 

lib/matplotlib/table.py

@@ -279,7 +279,9 @@ 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]
+        boxes = [cell.get_window_extent(renderer)
+                 for cell in self._cells.values()]
+
         return Bbox.union(boxes)
 
     def _do_cell_alignment(self):

lib/matplotlib/tests/test_artist.py

@@ -0,0 +1,81 @@
+from __future__ import print_function
+
+from matplotlib.testing.decorators import cleanup
+
+import matplotlib.pyplot as plt
+
+import matplotlib.patches as mpatches
+import matplotlib.transforms as mtrans
+import matplotlib.collections as mcollections
+
+
+@cleanup
+def test_patch_transform_of_none():
+    # tests the behaviour of patches added to an Axes with various transform
+    # specifications
+    
+    ax = plt.axes()
+    ax.set_xlim([1, 3])
+    ax.set_ylim([1, 3])
+    
+    #draw an ellipse over data coord (2,2) by specifying device coords
+    xy_data = (2, 2)
+    xy_pix = ax.transData.transform_point(xy_data)
+    
+    # not providing a transform of None puts the ellipse in data coordinates 
+    e = mpatches.Ellipse(xy_data, width=1, height=1, fc='yellow', alpha=0.5)
+    ax.add_patch(e)
+    assert e._transform == ax.transData
+    
+    # providing a transform of None puts the ellipse in device coordinates
+    e = mpatches.Ellipse(xy_pix, width=120, height=120, fc='coral', 
+                         transform=None, alpha=0.5)
+    ax.add_patch(e)
+    assert isinstance(e._transform, mtrans.IdentityTransform)
+    
+    # providing an IdentityTransform puts the ellipse in device coordinates
+    e = mpatches.Ellipse(xy_pix, width=100, height=100, 
+                         transform=mtrans.IdentityTransform(), alpha=0.5)
+    ax.add_patch(e)
+    assert isinstance(e._transform, mtrans.IdentityTransform)
+    
+
+@cleanup
+def test_collection_transform_of_none():
+    # tests the behaviour of collections added to an Axes with various 
+    # transform specifications
+
+    ax = plt.axes()
+    ax.set_xlim([1, 3])
+    ax.set_ylim([1, 3])
+    
+    #draw an ellipse over data coord (2,2) by specifying device coords
+    xy_data = (2, 2)
+    xy_pix = ax.transData.transform_point(xy_data)
+    
+    # not providing a transform of None puts the ellipse in data coordinates 
+    e = mpatches.Ellipse(xy_data, width=1, height=1)
+    c = mcollections.PatchCollection([e], facecolor='yellow', alpha=0.5)
+    ax.add_collection(c)
+    # the collection should be in data coordinates 
+    assert c.get_offset_transform() + c.get_transform() == ax.transData
+    
+    # providing a transform of None puts the ellipse in device coordinates
+    e = mpatches.Ellipse(xy_pix, width=120, height=120)
+    c = mcollections.PatchCollection([e], facecolor='coral', 
+                                     alpha=0.5)
+    c.set_transform(None)                          
+    ax.add_collection(c)
+    assert isinstance(c.get_transform(), mtrans.IdentityTransform)
+    
+    # providing an IdentityTransform puts the ellipse in device coordinates
+    e = mpatches.Ellipse(xy_pix, width=100, height=100)
+    c = mcollections.PatchCollection([e], transform=mtrans.IdentityTransform(), 
+                                     alpha=0.5)
+    ax.add_collection(c)
+    assert isinstance(c._transOffset, mtrans.IdentityTransform)
+    
+
+if __name__=='__main__':
+    import nose
+    nose.runmodule(argv=['-s','--with-doctest'], exit=False)

setup.py

@@ -73,6 +73,16 @@
 
 ext_modules = []
 
+classifiers = [
+    'Development Status :: 5 - Production/Stable',
+    'Intended Audience :: Science/Research',
+    'License :: OSI Approved :: Python Software Foundation License',
+    'Programming Language :: Python',
+    'Programming Language :: Python :: 2',
+    'Programming Language :: Python :: 3',
+    'Topic :: Scientific/Engineering :: Visualization',
+    ]
+
 for line in open('lib/matplotlib/__init__.py').readlines():
     if (line.startswith('__version__')):
         exec(line.strip())
@@ -319,6 +329,7 @@ def run_2to3(self, files):
       ext_modules = ext_modules,
       package_dir = package_dir,
       package_data = package_data,
+      classifiers = classifiers,
       cmdclass = {'build_py': build_py},
       **additional_params
       )