matplotlib
diff --git a/‎CHANGELOG‎
Lines changed: 9 additions & 0 deletions b/‎CHANGELOG‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎lib/matplotlib/__init__.py‎
Lines changed: 8 additions & 0 deletions b/‎lib/matplotlib/__init__.py‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎lib/matplotlib/config/__init__.py‎
Lines changed: 12 additions & 1 deletion b/‎lib/matplotlib/config/__init__.py‎
Lines changed: 12 additions & 1 deletion
diff --git a/‎lib/matplotlib/config/api.py‎
Lines changed: 0 additions & 12 deletions b/‎lib/matplotlib/config/api.py‎
Lines changed: 0 additions & 12 deletions
diff --git a/‎lib/matplotlib/config/cutils.py‎
Lines changed: 1 addition & 1 deletion b/‎lib/matplotlib/config/cutils.py‎
Lines changed: 1 addition & 1 deletion
@@ -1,3 +1,12 @@
+2007-07-30 Reorganized configuration code to work with traited config
+           objects. The new config system is located in the 
+           matplotlib.config package, but it is disabled by default.
+           To enable it, set NEWCONFIG=True in matplotlib.__init__.py.
+           The new configuration system will still use the old 
+           matplotlibrc files by default. To switch to the experimental,
+           traited configuration, set USE_TRAITED_CONFIG=True in 
+           config.__init__.py.
+
 2007-07-29 Changed default pcolor shading to flat; added aliases
            to make collection kwargs agree with setter names, so
            updating works; related minor cleanups.
 
@@ -55,6 +55,7 @@
 """
 from __future__ import generators
 
+NEWCONFIG = False
 
 __version__  = '0.90.1'
 __revision__ = '$Revision$'
@@ -706,6 +707,13 @@ def rcdefaults():
     """
     rcParams.update(rcParamsDefault)
 
+if NEWCONFIG:
+    print "importing from reorganized config system!"
+    from config import rcParams, rcdefaults
+    try:
+        from config import mplConfig, save_config
+    except:
+        pass
 
 def use(arg):
     """
 
@@ -1 +1,12 @@
-# Please keep this file empty
+# Please keep this file empty
+
+USE_TRAITED_CONFIG = False
+
+from rcparams import rc
+from cutils import get_config_file
+
+if USE_TRAITED_CONFIG:
+    print 'Using new config system!'
+    from mplconfig import rcParams, mplConfig, save_config, rcdefaults
+else:
+    from rcparams import rcParams, rcdefaults
@@ -179,4 +179,4 @@ def get_config_file(tconfig=False):
     fname = os.path.join(path, filename)
     if not os.path.exists(fname):
         warnings.warn('Could not find %s; using defaults'%filename)
-    return fname
+    return fname