SF.net SVN: matplotlib: [3718] trunk/matplotlib/lib/matplotlib/config/ tconfig.py

[<ds...@us...>]

Revision: 3718
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3718&view=rev
Author:   dsdale
Date:     2007-08-20 05:47:45 -0700 (Mon, 20 Aug 2007)

Log Message:
-----------
sync tconfig.py with sources in ipython1

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/config/tconfig.py

Modified: trunk/matplotlib/lib/matplotlib/config/tconfig.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/config/tconfig.py	2007-08-20 12:47:42 UTC (rev 3717)
+++ trunk/matplotlib/lib/matplotlib/config/tconfig.py	2007-08-20 12:47:45 UTC (rev 3718)
@@ -370,8 +370,6 @@
         if config is None:
             config = mkConfigObj(None)
 
-        
-
         # Validate the set of scalars ...
         my_scalars = set(get_scalars(self))
         cf_scalars = set(config.scalars)
@@ -603,7 +601,7 @@
 
         This method, in contrast with write(), updates the .fconfCombined
         object with the *entire* .tconf instance, and then writes it out to
-        disk.  This method is thus useful for generating files that contain an
+        disk.  This method is thus useful for generating files that have a
         self-contained, non-hierarchical file.
 
         :Keywords:
@@ -615,12 +613,12 @@
         if filename is not None:
             fileObj = open(filename,'w')
             self.fconfUpdate(self.fconfCombined,self.tconf)
-            out = self.fconf.write(fileObj)
+            out = self.fconfCombined.write(fileObj)
             fileObj.close()
             return out
         else:
             self.fconfUpdate(self.fconfCombined,self.tconf)
-            return self.fconf.write()
+            return self.fconfCombined.write()
 
     def tconfStr(self):
         return str(self.tconf)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.