r17781 - in /trunk/generic_fns: diffusion_tensor.py relax_data.py -- October 09, 2012 - 10:29

Author: bugman
Date: Tue Oct  9 10:29:53 2012
New Revision: 17781

URL: http://svn.gna.org/viewcvs/relax?rev=17781&view=rev
Log:
More Python 3 fixes for the use of now non-existent string module functions.


Modified:
    trunk/generic_fns/diffusion_tensor.py
    trunk/generic_fns/relax_data.py

Modified: trunk/generic_fns/diffusion_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/diffusion_tensor.py?rev=17781&r1=17780&r2=17781&view=diff
==============================================================================
--- trunk/generic_fns/diffusion_tensor.py (original)
+++ trunk/generic_fns/diffusion_tensor.py Tue Oct  9 10:29:53 2012
@@ -208,7 +208,7 @@
             attached_isotope_list.append(None)
 
         # Other info.
-        isotope_list.append(int(string.strip(spin.isotope, 
string.ascii_letters)))
+        isotope_list.append(int(spin.isotope.strip(string.ascii_letters)))
         element_list.append(spin.element)
 
     # Convert the molecule names into the entity IDs.

Modified: trunk/generic_fns/relax_data.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/relax_data.py?rev=17781&r1=17780&r2=17781&view=diff
==============================================================================
--- trunk/generic_fns/relax_data.py (original)
+++ trunk/generic_fns/relax_data.py Tue Oct  9 10:29:53 2012
@@ -150,7 +150,7 @@
         keys = list(data.keys())
 
         # Sample conditions do not match (remove the $ sign).
-        if 'sample_cond_list_label' in keys and sample_conditions and 
string.replace(data['sample_cond_list_label'], '$', '') != sample_conditions:
+        if 'sample_cond_list_label' in keys and sample_conditions and 
data['sample_cond_list_label'].replace('$', '') != sample_conditions:
             continue
 
         # Create the labels.
@@ -332,7 +332,7 @@
                 ri_data_err_list[i].append(None)
 
         # Other info.
-        isotope_list.append(int(string.strip(spin.isotope, 
string.ascii_letters)))
+        isotope_list.append(int(spin.isotope.strip(string.ascii_letters)))
         element_list.append(spin.element)
 
     # Convert the molecule names into the entity IDs.