SF.net SVN: matplotlib: [5420] trunk/matplotlib/lib/matplotlib

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

Revision: 5420
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5420&view=rev
Author:   efiring
Date:     2008-06-07 18:49:09 -0700 (Sat, 07 Jun 2008)

Log Message:
-----------
Fix bug in last commit and in matplotlib.use

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

Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/__init__.py	2008-06-08 01:23:21 UTC (rev 5419)
+++ trunk/matplotlib/lib/matplotlib/__init__.py	2008-06-08 01:49:09 UTC (rev 5420)
@@ -763,6 +763,7 @@
     """
     if 'matplotlib.backends' in sys.modules:
         if warn: warnings.warn(_use_error_msg)
+        return
     arg = arg.lower()
     be_parts = arg.split('.')
     name = validate_backend(be_parts[0])

Modified: trunk/matplotlib/lib/matplotlib/rcsetup.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/rcsetup.py	2008-06-08 01:23:21 UTC (rev 5419)
+++ trunk/matplotlib/lib/matplotlib/rcsetup.py	2008-06-08 01:49:09 UTC (rev 5420)
@@ -12,10 +12,10 @@
 from matplotlib.fontconfig_pattern import parse_fontconfig_pattern
 from matplotlib.colors import is_color_like
 
-interactive_bk = ['GTK', 'GTKAgg', 'GTKCairo', 'FltkAgg', 'QtAgg', 'Qt4Agg',
-                  'TkAgg', 'WX', 'WXAgg', 'CocoaAgg']
-non_interactive_bk = ['Agg', 'Cairo', 'EMF', 'GDK',
-                      'Pdf', 'PS', 'SVG', 'Template']
+interactive_bk = ['gtk', 'gtkagg', 'gtkcairo', 'fltkagg', 'qtagg', 'qt4agg',
+                  'tkagg', 'wx', 'wxagg', 'cocoaagg']
+non_interactive_bk = ['agg', 'cairo', 'emv', 'gdk',
+                      'pdf', 'ps', 'svg', 'template']
 all_backends = interactive_bk + non_interactive_bk
 
 


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