r10464 - in /branches/bieri_gui: ./ generic_fns/state.py -- January 28, 2010 - 09:40

Author: bugman
Date: Thu Jan 28 09:40:15 2010
New Revision: 10464

URL: http://svn.gna.org/viewcvs/relax?rev=10464&view=rev
Log:
Merged revisions 10461-10462 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r10461 | bugman | 2010-01-28 09:37:58 +0100 (Thu, 28 Jan 2010) | 3 lines
  
  The generic_fns.state.load_state() function can now have the verbosity 
level changed.
........
  r10462 | bugman | 2010-01-28 09:38:30 +0100 (Thu, 28 Jan 2010) | 3 lines
  
  Epydoc fix for generic_fns.state.save_state().  Verbosity is a keyword arg!
........

Modified:
    branches/bieri_gui/   (props changed)
    branches/bieri_gui/generic_fns/state.py

Propchange: branches/bieri_gui/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jan 28 09:40:15 2010
@@ -1,1 +1,1 @@
-/1.3:1-10450
+/1.3:1-10463

Modified: branches/bieri_gui/generic_fns/state.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/generic_fns/state.py?rev=10464&r1=10463&r2=10464&view=diff
==============================================================================
--- branches/bieri_gui/generic_fns/state.py (original)
+++ branches/bieri_gui/generic_fns/state.py Thu Jan 28 09:40:15 2010
@@ -98,19 +98,21 @@
     return True
 
 
-def load_state(state=None, dir=None, force=False):
+def load_state(state=None, dir=None, verbosity=1, force=False):
     """Function for loading a saved program state.
 
     @keyword state:     The saved state file.
     @type state:        str
     @keyword dir:       The path of the state file.
     @type dir:          str
+    @keyword verbosity: The verbosity level.
+    @type verbosity:    int
     @keyword force:     If True, the relax data store will be reset prior to 
state loading.
     @type force:        bool
     """
 
     # Open the file for reading.
-    file = open_read_file(file_name=state, dir=dir)
+    file = open_read_file(file_name=state, dir=dir, verbosity=verbosity)
 
     # Determine the format of the file.
     format = determine_format(file)
@@ -143,7 +145,7 @@
     @type state:            str
     @keyword dir:           The path of the state file.
     @type dir:              str
-    @param verbosity:       The verbosity level.
+    @keyword verbosity:     The verbosity level.
     @type verbosity:        int
     @keyword force:         Boolean argument which if True causes the file 
to be overwritten if it
                             already exists.