mplconfig was not reading .conf file in mpl-data

ddale · ddale · commit c93a5e9d2591 · 2007-07-31T13:11:34.000Z
svn path=/trunk/matplotlib/; revision=3644
diff --git a/lib/matplotlib/config/cutils.py b/lib/matplotlib/config/cutils.py
@@ -172,7 +172,7 @@ def get_config_file(tconfig=False):
                 return fname
 
     fname = os.path.join(get_configdir(), filename)
-    if os.path.exists(fname) or tconfig: return fname
+    if os.path.exists(fname): return fname
 
 
     path =  get_data_path() # guaranteed to exist or raise
diff --git a/lib/matplotlib/config/mplconfig.py b/lib/matplotlib/config/mplconfig.py
@@ -15,6 +15,7 @@
 import pytz
 
 # Code begins
+DEBUG = False
 
 ##############################################################################
 # Main Config class follows
@@ -172,7 +173,7 @@ class axes(TConfig):
         facecolor = T.Trait('white', mplT.ColorHandler())
         edgecolor = T.Trait('black', mplT.ColorHandler())
         linewidth = T.Float(1.0)
-        grid = T.Trait(True, mplT.BoolHandler())
+        grid = T.Trait(False, mplT.BoolHandler())
         polargrid = T.Trait(True, mplT.BoolHandler())
         titlesize = T.Trait('large', 'xx-small', 'x-small', 'small', 'medium',
                             'large', 'x-large', 'xx-large', T.Float)
@@ -467,6 +468,8 @@ def has_key(self, val):
     config_file = cutils.get_config_file(tconfig=True)
     CONVERT = False
 
+if DEBUG: print 'loading', config_file
+
 configManager = TConfigManager(MPLConfig,
                                config_file,
                                filePriority=True)
diff --git a/lib/matplotlib/mpl-data/matplotlib.conf b/lib/matplotlib/mpl-data/matplotlib.conf
@@ -124,9 +124,9 @@ units = False
     
     color = 'blue'
     
-    # The default marker: None, 'o', '.', ',', '^', 'v', '<', '>', 's', '+',
+    # The default marker: 'None', 'o', '.', ',', '^', 'v', '<', '>', 's', '+',
     # 'x', 'D', 'd', '1', '2', '3', '4', 'h', 'H', 'p', '|', '_'
-    marker = None
+    marker = 'None'
     
     # the line width around the marker symbol
     markeredgewidth = 0.5
