SF.net SVN: matplotlib:[8838] trunk/matplotlib

[<md...@us...>]

Revision: 8838
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8838&view=rev
Author:   mdboom
Date:     2010-12-14 15:56:25 +0000 (Tue, 14 Dec 2010)

Log Message:
-----------
Merged revisions 8837 via svnmerge from 
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8837 | mdboom | 2010-12-14 10:54:03 -0500 (Tue, 14 Dec 2010) | 2 lines
  
  NonUniformImage only supports nearest and bilinear interpolation, so if the user passes something else, an exception should be raised.
........

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/image.py

Property Changed:
----------------
    trunk/matplotlib/


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /trunk/matplotlib:1-7315 /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_91_maint:1-6428 /branches/v1_0_maint:1-8830,8835
   + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8837 /trunk/matplotlib:1-7315

Modified: trunk/matplotlib/lib/matplotlib/image.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/image.py	2010-12-14 15:54:03 UTC (rev 8837)
+++ trunk/matplotlib/lib/matplotlib/image.py	2010-12-14 15:56:25 UTC (rev 8838)
@@ -659,7 +659,7 @@
         interp = kwargs.pop('interpolation', 'nearest')
         AxesImage.__init__(self, ax,
                            **kwargs)
-        AxesImage.set_interpolation(self, interp)
+        self.set_interpolation(interp)
 
     def _check_unsampled_image(self, renderer):
         """


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.