SF.net SVN: matplotlib:[7334] branches/v0_99_maint

[<jd...@us...>]

Revision: 7334
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7334&view=rev
Author:   jdh2358
Date:     2009-08-03 16:38:25 +0000 (Mon, 03 Aug 2009)

Log Message:
-----------
handled sf bugs 2831556 and 2830525; better bar error messages and backend driver configs

Modified Paths:
--------------
    branches/v0_99_maint/examples/tests/backend_driver.py
    branches/v0_99_maint/lib/matplotlib/axes.py

Modified: branches/v0_99_maint/examples/tests/backend_driver.py
===================================================================
--- branches/v0_99_maint/examples/tests/backend_driver.py	2009-08-03 16:32:38 UTC (rev 7333)
+++ branches/v0_99_maint/examples/tests/backend_driver.py	2009-08-03 16:38:25 UTC (rev 7334)
@@ -374,7 +374,7 @@
         if backend in rcsetup.interactive_bk:
             tmpfile.write('show()')
         else:
-            tmpfile.write('\nsavefig("%s", dpi=150)' % outfile)
+            tmpfile.write('\nsavefig(r"%s", dpi=150)' % outfile)
 
         tmpfile.close()
         start_time = time.time()
@@ -458,7 +458,7 @@
         python = ['valgrind', '--tool=memcheck', '--leak-check=yes',
                   '--log-file=%(name)s', 'python']
     elif sys.platform == 'win32':
-        python = [r'c:\Python24\python.exe']
+        python = [sys.executable]
     else:
         python = ['python']
 

Modified: branches/v0_99_maint/lib/matplotlib/axes.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/axes.py	2009-08-03 16:32:38 UTC (rev 7333)
+++ branches/v0_99_maint/lib/matplotlib/axes.py	2009-08-03 16:38:25 UTC (rev 7334)
@@ -4229,20 +4229,20 @@
 
         # FIXME: convert the following to proper input validation
         # raising ValueError; don't use assert for this.
-        assert len(left)==nbars, "argument 'left' must be %d or scalar" % nbars
-        assert len(height)==nbars, ("argument 'height' must be %d or scalar" %
+        assert len(left)==nbars, "incompatible sizes: argument 'left' must be length %d or scalar" % nbars
+        assert len(height)==nbars, ("incompatible sizes: argument 'height' must be length %d or scalar" %
                                     nbars)
-        assert len(width)==nbars, ("argument 'width' must be %d or scalar" %
+        assert len(width)==nbars, ("incompatible sizes: argument 'width' must be length %d or scalar" %
                                    nbars)
-        assert len(bottom)==nbars, ("argument 'bottom' must be %d or scalar" %
+        assert len(bottom)==nbars, ("incompatible sizes: argument 'bottom' must be length %d or scalar" %
                                     nbars)
 
         if yerr is not None and len(yerr)!=nbars:
             raise ValueError(
-                "bar() argument 'yerr' must be len(%s) or scalar" % nbars)
+                "incompatible sizes: bar() argument 'yerr' must be len(%s) or scalar" % nbars)
         if xerr is not None and len(xerr)!=nbars:
             raise ValueError(
-                "bar() argument 'xerr' must be len(%s) or scalar" % nbars)
+                "incompatible sizes: bar() argument 'xerr' must be len(%s) or scalar" % nbars)
 
         patches = []
 


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