Fix bug in last commit and in matplotlib.use

efiring · efiring · commit b5b8f25438e9 · 2008-06-08T01:49:09.000Z
svn path=/trunk/matplotlib/; revision=5420
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -763,6 +763,7 @@ def use(arg, warn=True):
     """
     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])
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -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
 
 
