r16217 - in /branches/uf_redesign: generic_fns/results.py user_functions/results.py -- May 10, 2012 - 23:27

Author: bugman
Date: Thu May 10 23:27:47 2012
New Revision: 16217

URL: http://svn.gna.org/viewcvs/relax?rev=16217&view=rev
Log:
Renamed the results.read and results.write uf 'directory' arg to 'dir'.

This in both the front and back ends.


Modified:
    branches/uf_redesign/generic_fns/results.py
    branches/uf_redesign/user_functions/results.py

Modified: branches/uf_redesign/generic_fns/results.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/generic_fns/results.py?rev=16217&r1=16216&r2=16217&view=diff
==============================================================================
--- branches/uf_redesign/generic_fns/results.py (original)
+++ branches/uf_redesign/generic_fns/results.py Thu May 10 23:27:47 2012
@@ -72,7 +72,7 @@
     ds.to_xml(sys.stdout)
 
 
-def read(file='results', directory=None):
+def read(file='results', dir=None):
     """Function for reading the data out of a file."""
 
     # Test if the current data pipe exists.
@@ -83,7 +83,7 @@
         raise RelaxError("The current data pipe is not empty.")
 
     # Get the full file path, for later use.
-    file_path = get_file_path(file_name=file, dir=directory)
+    file_path = get_file_path(file_name=file, dir=dir)
 
     # Open the file.
     file = open_read_file(file_name=file_path)
@@ -117,18 +117,18 @@
         raise RelaxError("The format of the results file " + repr(file_path) 
+ " cannot be determined.")
 
 
-def write(file="results", directory=None, force=False, compress_type=1, 
verbosity=1):
+def write(file="results", dir=None, force=False, compress_type=1, 
verbosity=1):
     """Create the results file."""
 
     # Test if the current data pipe exists.
     pipes.test()
 
     # The special data pipe name directory.
-    if directory == 'pipe_name':
-        directory = pipes.cdp_name()
+    if dir == 'pipe_name':
+        dir = pipes.cdp_name()
 
     # Open the file for writing.
-    results_file = open_write_file(file_name=file, dir=directory, 
force=force, compress_type=compress_type, verbosity=verbosity)
+    results_file = open_write_file(file_name=file, dir=dir, force=force, 
compress_type=compress_type, verbosity=verbosity)
 
     # Write the results.
     ds.to_xml(results_file, pipes=pipes.cdp_name())

Modified: branches/uf_redesign/user_functions/results.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/user_functions/results.py?rev=16217&r1=16216&r2=16217&view=diff
==============================================================================
--- branches/uf_redesign/user_functions/results.py (original)
+++ branches/uf_redesign/user_functions/results.py Thu May 10 23:27:47 2012
@@ -64,7 +64,7 @@
     desc = "The name of the file to read results from."
 )
 uf.add_keyarg(
-    name = "directory",
+    name = "dir",
     py_type = "str",
     arg_type = "dir",
     desc_short = "directory name",
@@ -94,7 +94,7 @@
     desc = "The name of the file to output results to.  The default is 
'results'.  Optionally this can be a file object, or any object with a 
write() method."
 )
 uf.add_keyarg(
-    name = "directory",
+    name = "dir",
     default = "pipe_name",
     py_type = "str",
     arg_type = "dir",