Author: bugman Date: Mon Jan 28 11:09:35 2013 New Revision: 18325 URL: http://svn.gna.org/viewcvs/relax?rev=18325&view=rev Log: The GUI tests base class module now uses the Python 2/3 relax compat module. Modified: trunk/test_suite/gui_tests/base_classes.py Modified: trunk/test_suite/gui_tests/base_classes.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/gui_tests/base_classes.py?rev=18325&r1=18324&r2=18325&view=diff ============================================================================== --- trunk/test_suite/gui_tests/base_classes.py (original) +++ trunk/test_suite/gui_tests/base_classes.py Mon Jan 28 11:09:35 2013 @@ -1,6 +1,6 @@ ############################################################################### # # -# Copyright (C) 2006-2012 Edward d'Auvergne # +# Copyright (C) 2006-2013 Edward d'Auvergne # # # # This file is part of the program relax (http://www.nmr-relax.com). # # # @@ -25,10 +25,6 @@ # Python module imports. from math import pi # This is needed for relax scripts as pi is located in the relax prompt namespace. from os import sep -try: - import queue -except ImportError: - import Queue as queue from shutil import rmtree from tempfile import mktemp, mkdtemp from unittest import TestCase @@ -38,6 +34,7 @@ import dep_check # relax module imports. +from compat import Queue as queue from data import Relax_data_store; ds = Relax_data_store() from data.gui import Gui from generic_fns.reset import reset