r9636 - /1.3/relax_io.py -- October 07, 2009 - 17:53

Author: bugman
Date: Wed Oct  7 17:53:33 2009
New Revision: 9636

URL: http://svn.gna.org/viewcvs/relax?rev=9636&view=rev
Log:
Converted the file keyword args to read_ and write_spin_data() to normal args.


Modified:
    1.3/relax_io.py

Modified: 1.3/relax_io.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/relax_io.py?rev=9636&r1=9635&r2=9636&view=diff
==============================================================================
--- 1.3/relax_io.py (original)
+++ 1.3/relax_io.py Wed Oct  7 17:53:33 2009
@@ -462,7 +462,7 @@
         return file_obj
 
 
-def read_spin_data(file=None, dir=None, file_data=None, spin_id_col=None, 
mol_name_col=None, res_num_col=None, res_name_col=None, spin_num_col=None, 
spin_name_col=None, data_col=None, error_col=None, sep=None, spin_id=None):
+def read_spin_data(file, dir=None, file_data=None, spin_id_col=None, 
mol_name_col=None, res_num_col=None, res_name_col=None, spin_num_col=None, 
spin_name_col=None, data_col=None, error_col=None, sep=None, spin_id=None):
     """Generator function for reading the spin specific data from file.
 
     Description
@@ -473,7 +473,7 @@
     molecule name, residue name and number, and/or spin name and number.
 
 
-    @keyword file:          The name of the file to open.
+    @param file:            The name of the file to open.
     @type file:             str
     @keyword dir:           The directory containing the file (defaults to 
the current directory
                             if None).
@@ -664,7 +664,7 @@
         raise RelaxNoInPathError(binary)
 
 
-def write_spin_data(file=sys.stdout, dir=None, sep=None, spin_ids=None, 
mol_names=None, res_nums=None, res_names=None, spin_nums=None, 
spin_names=None, force=False, data=None, data_name=None, data_length=20, 
data_format=None, error=None, error_name=None, error_length=20, 
error_format=None):
+def write_spin_data(file, dir=None, sep=None, spin_ids=None, mol_names=None, 
res_nums=None, res_names=None, spin_nums=None, spin_names=None, force=False, 
data=None, data_name=None, data_length=20, data_format=None, error=None, 
error_name=None, error_length=20, error_format=None):
     """Generator function for reading the spin specific data from file.
 
     Description
@@ -675,7 +675,7 @@
     molecule name, residue name and number, and/or spin name and number.
 
 
-    @keyword file:          The name of the file to write the data to (or 
alternatively an already opened file object).
+    @param file:            The name of the file to write the data to (or 
alternatively an already opened file object).
     @type file:             str or file object
     @keyword dir:           The directory to place the file into (defaults 
to the current directory if None and the file argument is not a file object).
     @type dir:              str or None