r17632 - in /trunk: gui/controller.py gui/interpreter.py multi/multi_processor_base.py multi/result_queue.py -- October 01, 2012 - 22:27

Author: bugman
Date: Mon Oct  1 22:27:00 2012
New Revision: 17632

URL: http://svn.gna.org/viewcvs/relax?rev=17632&view=rev
Log:
Python 3 - fixes for the renaming of the Queue package.


Modified:
    trunk/gui/controller.py
    trunk/gui/interpreter.py
    trunk/multi/multi_processor_base.py
    trunk/multi/result_queue.py

Modified: trunk/gui/controller.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/controller.py?rev=17632&r1=17631&r2=17632&view=diff
==============================================================================
--- trunk/gui/controller.py (original)
+++ trunk/gui/controller.py Mon Oct  1 22:27:00 2012
@@ -24,7 +24,10 @@
 """Log window of relax GUI controlling all calculations."""
 
 # Python module imports.
-from Queue import Queue
+try:
+    from queue import Queue
+except ImportError:
+    from Queue import Queue
 import sys
 import wx
 import wx.stc

Modified: trunk/gui/interpreter.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/interpreter.py?rev=17632&r1=17631&r2=17632&view=diff
==============================================================================
--- trunk/gui/interpreter.py (original)
+++ trunk/gui/interpreter.py Mon Oct  1 22:27:00 2012
@@ -23,7 +23,10 @@
 """A threaded version of the relax interpreter for use by the GUI."""
 
 # Python module imports.
-from Queue import Queue
+try:
+    from queue import Queue
+except ImportError:
+    from Queue import Queue
 from re import search
 import sys
 from threading import Thread

Modified: trunk/multi/multi_processor_base.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/multi/multi_processor_base.py?rev=17632&r1=17631&r2=17632&view=diff
==============================================================================
--- trunk/multi/multi_processor_base.py (original)
+++ trunk/multi/multi_processor_base.py Mon Oct  1 22:27:00 2012
@@ -33,7 +33,10 @@
 """
 
 # Python module imports.
-import Queue
+try:
+    import queue
+except ImportError:
+    import Queue as queue
 from copy import copy
 import math
 import sys

Modified: trunk/multi/result_queue.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/multi/result_queue.py?rev=17632&r1=17631&r2=17632&view=diff
==============================================================================
--- trunk/multi/result_queue.py (original)
+++ trunk/multi/result_queue.py Mon Oct  1 22:27:00 2012
@@ -24,7 +24,10 @@
 """Module containing the results queue objects."""
 
 # Python module imports.
-import Queue
+try:
+    import queue
+except ImportError:
+    import Queue as queue
 import sys
 import threading
 import traceback