r18334 - /trunk/test_suite/gui_tests/base_classes.py -- February 01, 2013 - 11:38

Author: bugman
Date: Fri Feb  1 11:38:37 2013
New Revision: 18334

URL: http://svn.gna.org/viewcvs/relax?rev=18334&view=rev
Log:
Reverted -r18325 as this change breaks the GUI tests.

The command used was:
svn merge -r18325:r18324 .


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=18334&r1=18333&r2=18334&view=diff
==============================================================================
--- trunk/test_suite/gui_tests/base_classes.py (original)
+++ trunk/test_suite/gui_tests/base_classes.py Fri Feb  1 11:38:37 2013
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2006-2013 Edward d'Auvergne                                  
 #
+# Copyright (C) 2006-2012 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax (http://www.nmr-relax.com).         
 #
 #                                                                            
 #
@@ -25,6 +25,10 @@
 # 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
@@ -34,7 +38,6 @@
 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