r17686 - /trunk/test_suite/system_tests/model_free.py -- October 02, 2012 - 18:48

Author: bugman
Date: Tue Oct  2 18:48:25 2012
New Revision: 17686

URL: http://svn.gna.org/viewcvs/relax?rev=17686&view=rev
Log:
The Mf.test_write_results system test can now select the correct file to 
compare against in Python 3.

The algorithm for determining if the 'final_results_trunc_1.3_v2' or
'final_results_trunc_1.3_pre_py2.7.3_v2' file should be used could not handle 
Python 3.


Modified:
    trunk/test_suite/system_tests/model_free.py

Modified: trunk/test_suite/system_tests/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/model_free.py?rev=17686&r1=17685&r2=17686&view=diff
==============================================================================
--- trunk/test_suite/system_tests/model_free.py (original)
+++ trunk/test_suite/system_tests/model_free.py Tue Oct  2 18:48:25 2012
@@ -2611,7 +2611,7 @@
 
         # Read the 1.3 results file, extract the data, then close it again.
         a, b, c = platform.python_version_tuple()
-        if dep_check.xml_type == 'internal' and int(a) >= 2 and int(b) >= 7 
and int(c) >= 3:
+        if (dep_check.xml_type == 'internal' and int(a) >= 2 and int(b) >= 7 
and int(c) >= 3) or int(a) >= 3:
             file = open_read_file(file_name='final_results_trunc_1.3_v2', 
dir=path)
         else:
             file = 
open_read_file(file_name='final_results_trunc_1.3_pre_py2.7.3_v2', dir=path)