Author: bugman Date: Fri Sep 28 11:43:29 2012 New Revision: 17590 URL: http://svn.gna.org/viewcvs/relax?rev=17590&view=rev Log: Python 3 preparations - the GUI tests are now fully Python 2 and 3 compatible. The command used was: 2to3 -w -f except -f import -f imports -f long -f numliterals -f xrange . Modified: trunk/test_suite/gui_tests/dead_uf_pages.py trunk/test_suite/gui_tests/model_free.py Modified: trunk/test_suite/gui_tests/dead_uf_pages.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/gui_tests/dead_uf_pages.py?rev=17590&r1=17589&r2=17590&view=diff ============================================================================== --- trunk/test_suite/gui_tests/dead_uf_pages.py (original) +++ trunk/test_suite/gui_tests/dead_uf_pages.py Fri Sep 28 11:43:29 2012 @@ -44,7 +44,7 @@ try: # Call the object. self._execute_uf(uf_name='molecule.create', mol_name='x', mol_type='protein') - except RelaxNoPipeError, instance: + except RelaxNoPipeError as instance: sys.stderr.write(instance.__str__()) # Create a data pipe. Modified: trunk/test_suite/gui_tests/model_free.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/gui_tests/model_free.py?rev=17590&r1=17589&r2=17590&view=diff ============================================================================== --- trunk/test_suite/gui_tests/model_free.py (original) +++ trunk/test_suite/gui_tests/model_free.py Fri Sep 28 11:43:29 2012 @@ -217,7 +217,7 @@ res_nums.append(i) res_nums.append(i) spin_names = ["N", "H"] * 9 + ["NE1", "HE1"] - spin_nums = range(1, 21) + spin_nums = list(range(1, 21)) isotopes = ["15N", "1H"] * 10 csa = [-172e-6, None] * 10 select = [True, False] * 10