Author: bugman Date: Sun Jun 22 12:58:15 2008 New Revision: 6379 URL: http://svn.gna.org/viewcvs/relax?rev=6379&view=rev Log: Changed the args to the results.read() user function. The dir keyword now defaults to None and the format arg no longer exists, as it is assumed that relax will autodetect the file format. Modified: 1.3/prompt/results.py Modified: 1.3/prompt/results.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/results.py?rev=6379&r1=6378&r2=6379&view=diff ============================================================================== --- 1.3/prompt/results.py (original) +++ 1.3/prompt/results.py Sun Jun 22 12:58:15 2008 @@ -61,7 +61,7 @@ results.display() - def read(self, file='results', dir='dir', format='columnar'): + def read(self, file='results', dir=None): """Function for reading results from a file. Keyword Arguments @@ -87,8 +87,7 @@ if self.__relax__.interpreter.intro: text = sys.ps3 + "results.read(" text = text + "file=" + `file` - text = text + ", dir=" + `dir` - text = text + ", format=" + `format` + ")" + text = text + ", dir=" + `dir` + ")" print text # File. @@ -99,12 +98,8 @@ if dir != None and type(dir) != str: raise RelaxNoneStrError, ('directory name', dir) - # Format. - if type(format) != str: - raise RelaxStrError, ('format', format) - # Execute the functional code. - results.read(file=file, directory=dir, format=format) + results.read(file=file, directory=dir) def write(self, file='results', dir='dir', force=False, format='columnar', compress_type=1):