From: <ds...@us...> - 2007-07-31 13:11:35
|
Revision: 3644 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3644&view=rev Author: dsdale Date: 2007-07-31 06:11:34 -0700 (Tue, 31 Jul 2007) Log Message: ----------- mplconfig was not reading .conf file in mpl-data Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/config/cutils.py trunk/matplotlib/lib/matplotlib/config/mplconfig.py trunk/matplotlib/lib/matplotlib/mpl-data/matplotlib.conf Modified: trunk/matplotlib/lib/matplotlib/config/cutils.py =================================================================== --- trunk/matplotlib/lib/matplotlib/config/cutils.py 2007-07-31 06:53:07 UTC (rev 3643) +++ trunk/matplotlib/lib/matplotlib/config/cutils.py 2007-07-31 13:11:34 UTC (rev 3644) @@ -172,7 +172,7 @@ 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 Modified: trunk/matplotlib/lib/matplotlib/config/mplconfig.py =================================================================== --- trunk/matplotlib/lib/matplotlib/config/mplconfig.py 2007-07-31 06:53:07 UTC (rev 3643) +++ trunk/matplotlib/lib/matplotlib/config/mplconfig.py 2007-07-31 13:11:34 UTC (rev 3644) @@ -15,6 +15,7 @@ import pytz # Code begins +DEBUG = False ############################################################################## # Main Config class follows @@ -172,7 +173,7 @@ 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 @@ config_file = cutils.get_config_file(tconfig=True) CONVERT = False +if DEBUG: print 'loading', config_file + configManager = TConfigManager(MPLConfig, config_file, filePriority=True) Modified: trunk/matplotlib/lib/matplotlib/mpl-data/matplotlib.conf =================================================================== --- trunk/matplotlib/lib/matplotlib/mpl-data/matplotlib.conf 2007-07-31 06:53:07 UTC (rev 3643) +++ trunk/matplotlib/lib/matplotlib/mpl-data/matplotlib.conf 2007-07-31 13:11:34 UTC (rev 3644) @@ -124,9 +124,9 @@ 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |