r17795 - /trunk/test_suite/system_tests/model_free.py -- October 10, 2012 - 16:37

Author: bugman
Date: Wed Oct 10 16:37:34 2012
New Revision: 17795

URL: http://svn.gna.org/viewcvs/relax?rev=17795&view=rev
Log:
Fix for the Mf.test_write_results() system test for the Python 3 versions.

The logic for determining Python 3 versions was broken and the incorrect 
files was used for Python
3.1.


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=17795&r1=17794&r2=17795&view=diff
==============================================================================
--- trunk/test_suite/system_tests/model_free.py (original)
+++ trunk/test_suite/system_tests/model_free.py Wed Oct 10 16:37:34 2012
@@ -2621,12 +2621,12 @@
         file.close()
 
         # Read the results file for Python 3.2+.
-        if sys.version_info[0] >= 3 and sys.version_info[0] >= 2:
+        if sys.version_info[0] >= 3 and sys.version_info[1] >= 2:
             file = open_read_file(file_name='final_results_trunc_2.1_py3', 
dir=path)
 
         # Read the results file for Python 3.1.
-        if sys.version_info[0] >= 3 and sys.version_info[0] == 1:
-            file = open_read_file(file_name='final_results_trunc_1.3_v2', 
dir=path)
+        elif sys.version_info[0] >= 3 and sys.version_info[1] == 1:
+            file = 
open_read_file(file_name='final_results_trunc_1.3_pre_py2.7.3_v2', dir=path)
 
         # Read the results file for Python 2.7.3+ (excluding Python 3).
         elif dep_check.xml_type == 'internal' and sys.version_info[0] >= 2 
and sys.version_info[1] >= 7 and sys.version_info[2] >= 3: