r17593 - in /trunk/auto_analyses: dauvergne_protocol.py stereochem_analysis.py -- September 28, 2012 - 11:50

Author: bugman
Date: Fri Sep 28 11:50:34 2012
New Revision: 17593

URL: http://svn.gna.org/viewcvs/relax?rev=17593&view=rev
Log:
Python 3 preparations - the auto_analyses package is now fully Python 2 and 3 
compatible.

The command used was:
2to3 -w -f except -f import -f imports -f long -f numliterals -f xrange .


Modified:
    trunk/auto_analyses/dauvergne_protocol.py
    trunk/auto_analyses/stereochem_analysis.py

Modified: trunk/auto_analyses/dauvergne_protocol.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/dauvergne_protocol.py?rev=17593&r1=17592&r2=17593&view=diff
==============================================================================
--- trunk/auto_analyses/dauvergne_protocol.py (original)
+++ trunk/auto_analyses/dauvergne_protocol.py Fri Sep 28 11:50:34 2012
@@ -379,7 +379,7 @@
             self.conv_data.mf_vals[-1].append([])
 
             # Loop over the parameters.
-            for j in xrange(len(spin.params)):
+            for j in range(len(spin.params)):
                 # Get the parameters and values.
                 self.conv_data.mf_params[-1][-1].append(spin.params[j])
                 self.conv_data.mf_vals[-1][-1].append(getattr(spin, 
lower(spin.params[j])))

Modified: trunk/auto_analyses/stereochem_analysis.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/stereochem_analysis.py?rev=17593&r1=17592&r2=17593&view=diff
==============================================================================
--- trunk/auto_analyses/stereochem_analysis.py (original)
+++ trunk/auto_analyses/stereochem_analysis.py Fri Sep 28 11:50:34 2012
@@ -541,7 +541,7 @@
             self.interpreter.pipe.create("noe_viol_%s" % config, "N-state")
 
             # Read the first structure.
-            self.interpreter.structure.read_pdb("ensembles" + sep + config + 
"0.pdb", dir=self.results_dir, set_mol_name=config, set_model_num=range(1, 
self.num_models+1), parser="internal")
+            self.interpreter.structure.read_pdb("ensembles" + sep + config + 
"0.pdb", dir=self.results_dir, set_mol_name=config, 
set_model_num=list(range(1, self.num_models+1)), parser="internal")
 
             # Load all protons as the sequence.
             self.interpreter.structure.load_spins("@H*", ave_pos=False)
@@ -572,7 +572,7 @@
                 self.interpreter.structure.delete()
 
                 # Read the ensemble.
-                self.interpreter.structure.read_pdb("ensembles" + sep + 
config + repr(ens) + ".pdb", dir=self.results_dir, set_mol_name=config, 
set_model_num=range(1, self.num_models+1), parser="internal")
+                self.interpreter.structure.read_pdb("ensembles" + sep + 
config + repr(ens) + ".pdb", dir=self.results_dir, set_mol_name=config, 
set_model_num=list(range(1, self.num_models+1)), parser="internal")
 
                 # Get the atomic positions.
                 self.interpreter.structure.get_pos(ave_pos=False)
@@ -630,7 +630,7 @@
             self.interpreter.pipe.create("rdc_analysis_%s" % config, 
"N-state")
 
             # Read the first structure.
-            self.interpreter.structure.read_pdb("ensembles_superimposed" + 
sep + config + "0.pdb", dir=self.results_dir, set_mol_name=config, 
set_model_num=range(1, self.num_models+1), parser="internal")
+            self.interpreter.structure.read_pdb("ensembles_superimposed" + 
sep + config + "0.pdb", dir=self.results_dir, set_mol_name=config, 
set_model_num=list(range(1, self.num_models+1)), parser="internal")
 
             # Load all spins as the sequence.
             self.interpreter.structure.load_spins(ave_pos=False)
@@ -670,7 +670,7 @@
                 self.interpreter.structure.delete()
 
                 # Read the ensemble.
-                self.interpreter.structure.read_pdb("ensembles_superimposed" 
+ sep + config + repr(ens) + ".pdb", dir=self.results_dir, 
set_mol_name=config, set_model_num=range(1, self.num_models+1), 
parser="internal")
+                self.interpreter.structure.read_pdb("ensembles_superimposed" 
+ sep + config + repr(ens) + ".pdb", dir=self.results_dir, 
set_mol_name=config, set_model_num=list(range(1, self.num_models+1)), 
parser="internal")
 
                 # Get the positional information, then load the CH vectors.
                 self.interpreter.structure.get_pos(ave_pos=False)