SF.net SVN: matplotlib:[6762] trunk/matplotlib/lib/matplotlib/__init__.py

[<ef...@us...>]

Revision: 6762
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6762&view=rev
Author:   efiring
Date:     2009-01-07 22:42:01 +0000 (Wed, 07 Jan 2009)

Log Message:
-----------
Merged 6754, 6761 from v0_98_5_maint

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

Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/__init__.py	2009-01-07 22:30:41 UTC (rev 6761)
+++ trunk/matplotlib/lib/matplotlib/__init__.py	2009-01-07 22:42:01 UTC (rev 6762)
@@ -679,7 +679,7 @@
 "%s"\n\t%s' % (val, cnt, line, fname, msg))
         elif key in _deprecated_ignore_map:
             warnings.warn('%s is deprecated. Update your matplotlibrc to use %s instead.'% (key, _deprecated_ignore_map[key]))
-            
+
         else:
             print >> sys.stderr, """
 Bad key "%s" on line %d in
@@ -838,9 +838,12 @@
     else:
         be_parts = arg.split('.')
         name = validate_backend(be_parts[0])
+        if len(be_parts) > 1:
+            if name == 'cairo':
+                rcParams['cairo.format'] = validate_cairo_format(be_parts[1])
+            else:
+                raise ValueError('Only cairo backend has a format option')
     rcParams['backend'] = name
-    if name == 'cairo' and len(be_parts) > 1:
-        rcParams['cairo.format'] = validate_cairo_format(be_parts[1])
 
 def get_backend():
     "Returns the current backend"


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