modify formatting of comments in matplotlib.conf

ddale · ddale · commit e2d286b2d620 · 2007-11-13T16:39:12.000Z
svn path=/trunk/matplotlib/; revision=4248
diff --git a/lib/matplotlib/config/mplconfig.py b/lib/matplotlib/config/mplconfig.py
@@ -43,11 +43,11 @@ class MPLConfig(TConfig):
     the default values listed herein.
 
     Colors: for the color values below, you can either use
-     - a matplotlib color string, such as r, k, or b
+     - a matplotlib color string, such as r | k | b
      - an rgb tuple, such as (1.0, 0.5, 0.0)
      - a hex string, such as #ff00ff or ff00ff
      - a scalar grayscale intensity such as 0.75
-     - a legal html color name, eg red, blue, darkslategray
+     - a legal html color name, eg red | blue | darkslategray
 
     Interactivity: see http://matplotlib.sourceforge.net/interactive.html.
 
@@ -63,8 +63,6 @@ class MPLConfig(TConfig):
     units = T.false
 
     class backend(TConfig):
-        """Valid backends are: 'GTKAgg', 'GTKCairo', 'QtAgg', 'Qt4Agg',
-        'TkAgg', 'Agg', 'Cairo', 'PS', 'PDF', 'SVG'"""
         use = T.Trait('Agg', mplT.BackendHandler())
 
         class cairo(TConfig):
diff --git a/lib/matplotlib/config/mpltraits.py b/lib/matplotlib/config/mpltraits.py
@@ -24,18 +24,22 @@ def is_string_like(obj):
 class BackendHandler(T.TraitHandler):
     """
     """
-    backends = {'tkagg': 'TkAgg',
+    backends = {'agg': 'Agg',
+                'cairo': 'Cairo',
+                'cocoaagg': 'CocoaAgg',
+                'fltkagg': 'FltkAgg',
+                'gtk': 'GTK',
                 'gtkagg': 'GTKAgg',
                 'gtkcairo': 'GTKCairo',
+                'pdf': 'Pdf',
+                'ps': 'PS',
                 'qt4agg': 'Qt4Agg',
                 'qtagg': 'QtAgg',
-                'wxagg': 'WXAgg',
-                'agg': 'Agg',
-                'cairo': 'Cairo',
-                'ps': 'PS',
-                'pdf': 'Pdf',
                 'svg': 'SVG',
-                'template': 'Template' }
+                'template': 'Template',
+                'tkagg': 'TkAgg',
+                'wx': 'WX',
+                'wxagg': 'WXAgg'}
 
     def validate(self, object, name, value):
         try:
@@ -46,7 +50,7 @@ def validate(self, object, name, value):
     def info(self):
         be = self.backends.keys()
         be.sort
-        return "one of %s"% ', '.join(['%s'%i for i in be])
+        return "one of: %s"% ' | '.join(['%s'%i for i in be])
 
 
 class BoolHandler(T.TraitHandler):
@@ -73,7 +77,7 @@ def validate(self, object, name, value):
             return self.error(object, name, value)
 
     def info(self):
-        return "one of %s"% ', '.join(['%s'%i for i in self.bools.keys()])
+        return "one of: %s"% ' | '.join(['%s'%i for i in self.bools.keys()])
 
 flexible_true = T.Trait(True, BoolHandler())
 flexible_false = T.Trait(False, BoolHandler())
diff --git a/lib/matplotlib/mpl-data/matplotlib.conf.template b/lib/matplotlib/mpl-data/matplotlib.conf.template
@@ -21,19 +21,19 @@
 # the default values listed herein.
 # 
 # Colors: for the color values below, you can either use
-#  - a matplotlib color string, such as r, k, or b
+#  - a matplotlib color string, such as r | k | b
 #  - an rgb tuple, such as (1.0, 0.5, 0.0)
 #  - a hex string, such as #ff00ff or ff00ff
 #  - a scalar grayscale intensity such as 0.75
-#  - a legal html color name, eg red, blue, darkslategray
+#  - a legal html color name, eg red | blue | darkslategray
 # 
 # Interactivity: see http://matplotlib.sourceforge.net/interactive.html.
 # 
 # ### CONFIGURATION BEGINS HERE ###
 
 # a value of type 'str'
 datapath = '/usr/lib64/python2.5/site-packages/matplotlib/mpl-data'
-# one of 0, on, false, 1, no, n, y, off, yes, true
+# one of: 0 | on | false | 1 | no | n | y | off | yes | true
 interactive = False
 # a value of type 'bool'
 maskedarray = False
@@ -64,9 +64,9 @@ units = False
     # name like 'orange', a hex color like '#efefef', a grayscale intensity
     # like '0.5', or an RGBA tuple (1,0,0,1)
     facecolor = 'white'
-    # one of 0, on, false, 1, no, n, y, off, yes, true
+    # one of: 0 | on | false | 1 | no | n | y | off | yes | true
     grid = False
-    # one of 0, on, false, 1, no, n, y, off, yes, true
+    # one of: 0 | on | false | 1 | no | n | y | off | yes | true
     hold = True
     # any valid matplotlib color, eg an abbreviation like 'r' for red, a full
     # name like 'orange', a hex color like '#efefef', a grayscale intensity
@@ -77,7 +77,7 @@ units = False
     labelsize = 'medium'
     # a value of type 'float'
     linewidth = 1.0
-    # one of 0, on, false, 1, no, n, y, off, yes, true
+    # one of: 0 | on | false | 1 | no | n | y | off | yes | true
     polargrid = True
     # a value of type 'float' or 'xx-small' or 'x-small' or 'small' or 'medium' 
     # or 'large' or 'x-large' or 'xx-large'
@@ -88,10 +88,8 @@ units = False
         limits = [-7.0, 7.0]
 
 [backend]
-    # Valid backends are: 'GTKAgg', 'GTKCairo', 'QtAgg', 'Qt4Agg',
-    # 'TkAgg', 'Agg', 'Cairo', 'PS', 'PDF', 'SVG'
-    # one of ps, qt4agg, tkagg, gtkagg, agg, cairo, gtkcairo, wxagg, qtagg, temp
-    # late, svg, pdf
+    # one of: ps | qt4agg | fltkagg | gtkagg | agg | cairo | gtk | gtkcairo | wx
+    # agg | tkagg | qtagg | template | svg | cocoaagg | pdf | wx
     use = 'Agg'
 
     [[cairo]]
diff --git a/setup.py b/setup.py
@@ -169,7 +169,6 @@
 if options['build_gtk']:
     if hasgtk or (options['build_gtk'] is True):
         build_gdk(ext_modules, packages)
-        rc['backend'] = 'GTK'
 if options['build_gtkagg']:
     if hasgtk or (options['build_gtkagg'] is True):
         options['build_agg'] = 1
