r16710 - in /branches/frame_order_testing: ./ data/mol_res_spin.py -- June 06, 2012 - 17:52

Author: bugman
Date: Wed Jun  6 17:52:50 2012
New Revision: 16710

URL: http://svn.gna.org/viewcvs/relax?rev=16710&view=rev
Log:
Merged revisions 16684 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r16684 | bugman | 2012-06-06 10:40:19 +0200 (Wed, 06 Jun 2012) | 6 lines
  
  Bug fix for the loading of the molecule name and type from relax state or 
results files.
  
  The str() builtin function is now used to convert the string from unicode 
to a normal string.  This
  is needed as u'My mol' != 'My mol', breaking a number of tests!
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/data/mol_res_spin.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jun  6 17:52:50 2012
@@ -1,1 +1,1 @@
-/1.3:1-16677
+/1.3:1-16708

Modified: branches/frame_order_testing/data/mol_res_spin.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/data/mol_res_spin.py?rev=16710&r1=16709&r2=16710&view=diff
==============================================================================
--- branches/frame_order_testing/data/mol_res_spin.py (original)
+++ branches/frame_order_testing/data/mol_res_spin.py Wed Jun  6 17:52:50 2012
@@ -738,10 +738,10 @@
         # Loop over the molecules.
         for mol_node in mol_nodes:
             # Get the molecule details and add the molecule to the 
MoleculeList structure.
-            name = mol_node.getAttribute('name')
+            name = str(mol_node.getAttribute('name'))
             if name == 'None':
                 name = None
-            type = mol_node.getAttribute('type')
+            type = str(mol_node.getAttribute('type'))
             if type == 'None':
                 type = None
             self.add_item(mol_name=name, mol_type=type)