r17589 - /trunk/test_suite/gui_tests/base_classes.py -- September 28, 2012 - 11:42

Author: bugman
Date: Fri Sep 28 11:42:00 2012
New Revision: 17589

URL: http://svn.gna.org/viewcvs/relax?rev=17589&view=rev
Log:
Python 3 preparations - the queue modules for both Python versions are now 
supported in the GUI tests.


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=17589&r1=17588&r2=17589&view=diff
==============================================================================
--- trunk/test_suite/gui_tests/base_classes.py (original)
+++ trunk/test_suite/gui_tests/base_classes.py Fri Sep 28 11:42:00 2012
@@ -25,7 +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
-import Queue
+try:
+    import queue
+except ImportError:
+    import Queue as queue
 from shutil import rmtree
 from tempfile import mktemp, mkdtemp
 from unittest import TestCase
@@ -152,7 +155,7 @@
             self.fail()
 
         # No exception.
-        except Queue.Empty:
+        except queue.Empty:
             pass