r15867 - /1.3/test_suite/system_tests/model_free.py -- May 02, 2012 - 11:46

Author: bugman
Date: Wed May  2 11:46:30 2012
New Revision: 15867

URL: http://svn.gna.org/viewcvs/relax?rev=15867&view=rev
Log:
The Mf.test_write_results system test now checks for the ancient PyXML.

This ancient version from 2004 which should be eliminated, if installed, 
causes the toprettyxml()
changes in Python 2.7.3 to be overridden.


Modified:
    1.3/test_suite/system_tests/model_free.py

Modified: 1.3/test_suite/system_tests/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/model_free.py?rev=15867&r1=15866&r2=15867&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/model_free.py (original)
+++ 1.3/test_suite/system_tests/model_free.py Wed May  2 11:46:30 2012
@@ -32,6 +32,7 @@
 # relax module imports.
 from base_classes import SystemTestCase
 from data import Relax_data_store; ds = Relax_data_store()
+import dep_check
 from generic_fns import pipes
 from generic_fns.mol_res_spin import spin_loop
 from physical_constants import N15_CSA, NH_BOND_LENGTH
@@ -2502,7 +2503,7 @@
 
         # Read the 1.3 results file, extract the data, then close it again.
         a, b, c = platform.python_version_tuple()
-        if 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:
             file = open_read_file(file_name='final_results_trunc_1.3_new', 
dir=path)
         else:
             file = open_read_file(file_name='final_results_trunc_1.3', 
dir=path)