[GRASS-SVN] r46589 - grass/branches/releasebranch_6_4/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-06-07 09:32:57 -0700 (Tue, 07 Jun 2011)
New Revision: 46589

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/preferences.py
Log:
wxGUI/pref: add dox strings for _readFile()
	    (merge r46588 from devbr6)


Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/preferences.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/preferences.py	2011-06-07 16:31:07 UTC (rev 46588)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/preferences.py	2011-06-07 16:32:57 UTC (rev 46589)
@@ -690,7 +690,11 @@
                                                 key = 'font', subkey = 'encoding')
         
     def _readFile(self, filename, settings = None):
-        """!Read settings from file to dict"""
+        """!Read settings from file to dict
+
+        @param filename settings file path
+        @param settings dict where to store settings (None for self.userSettings)
+        """
         if settings is None:
             settings = self.userSettings
         
@@ -732,7 +736,7 @@
             fd.close()
         
         fd.close()
-
+        
     def SaveToFile(self, settings = None):
         """!Save settings to the file"""
         if settings is None: