r17683 - in /trunk/generic_fns: results.py state.py -- October 02, 2012 - 18:29

Author: bugman
Date: Tue Oct  2 18:29:25 2012
New Revision: 17683

URL: http://svn.gna.org/viewcvs/relax?rev=17683&view=rev
Log:
Python 3 fix for the format detection of results and save files.


Modified:
    trunk/generic_fns/results.py
    trunk/generic_fns/state.py

Modified: trunk/generic_fns/results.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/results.py?rev=17683&r1=17682&r2=17683&view=diff
==============================================================================
--- trunk/generic_fns/results.py (original)
+++ trunk/generic_fns/results.py Tue Oct  2 18:29:25 2012
@@ -47,7 +47,8 @@
     # Header line.
     header = file.readline()
     header = header[:-1]    # Strip the trailing newline.
-    header = str(header)    # Convert to a string type.
+    if hasattr(header, 'decode'):     # Python 3 byte type conversion.
+        header = header.decode()
 
     # Be nice and go back to the start of the file.
     file.seek(0)

Modified: trunk/generic_fns/state.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/state.py?rev=17683&r1=17682&r2=17683&view=diff
==============================================================================
--- trunk/generic_fns/state.py (original)
+++ trunk/generic_fns/state.py Tue Oct  2 18:29:25 2012
@@ -49,7 +49,8 @@
     # 1st line.
     header = file.readline()
     header = header[:-1]    # Strip the trailing newline.
-    header = str(header)    # Convert to a string type.
+    if hasattr(header, 'decode'):     # Python 3 byte type conversion.
+        header = header.decode()
 
     # Be nice and go back to the start of the file.
     file.seek(0)