r9456 - /branches/cst/generic_fns/chemical_shift.py -- September 03, 2009 - 15:52

Author: bugman
Date: Thu Sep  3 15:52:50 2009
New Revision: 9456

URL: http://svn.gna.org/viewcvs/relax?rev=9456&view=rev
Log:
More updates for Python3k.

The command used was:
2to3 -w \
-f buffer \
-f idioms \
-f set_literal \
-f ws_comma \
-x except \
-x import \
-x imports \
-x long \
-x numliterals \
-x xrange \
relax .

This is from the docs/2to3_checklist document.


Modified:
    branches/cst/generic_fns/chemical_shift.py

Modified: branches/cst/generic_fns/chemical_shift.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/cst/generic_fns/chemical_shift.py?rev=9456&r1=9455&r2=9456&view=diff
==============================================================================
--- branches/cst/generic_fns/chemical_shift.py (original)
+++ branches/cst/generic_fns/chemical_shift.py Thu Sep  3 15:52:50 2009
@@ -114,7 +114,7 @@
                 spin.remap_table.pop(index)
 
         # Remove any data with error of None.
-        for index,error in enumerate(spin.relax_error):
+        for index, error in enumerate(spin.relax_error):
             if error == None:
                 spin.relax_data.pop(index)
                 spin.relax_error.pop(index)
@@ -133,7 +133,7 @@
     # Simulation data.
     else:
         # Create the data structure if necessary.
-        if not hasattr(spin, 'relax_sim_data') or type(spin.relax_sim_data) 
!= list:
+        if not hasattr(spin, 'relax_sim_data') or not 
isinstance(spin.relax_sim_data, list):
             spin.relax_sim_data = []
 
         # Append the simulation's relaxation data.