Author: bugman Date: Sat Oct 20 18:37:18 2012 New Revision: 17932 URL: http://svn.gna.org/viewcvs/relax?rev=17932&view=rev Log: Merged revisions 17931 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r17931 | bugman | 2012-10-20 18:36:31 +0200 (Sat, 20 Oct 2012) | 6 lines Fix for a fatal bug in the multi-processor code (https://gna.org/bugs/?20253). The Queue module is now imported as 'queue' for Python 3 support, so the code was referring to the wrong object name. ........ Modified: branches/frame_order_testing/ (props changed) branches/frame_order_testing/multi/result_queue.py Propchange: branches/frame_order_testing/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Sat Oct 20 18:37:18 2012 @@ -1,1 +1,1 @@ -/trunk:1-17925 +/trunk:1-17931 Modified: branches/frame_order_testing/multi/result_queue.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/multi/result_queue.py?rev=17932&r1=17931&r2=17932&view=diff ============================================================================== --- branches/frame_order_testing/multi/result_queue.py (original) +++ branches/frame_order_testing/multi/result_queue.py Sat Oct 20 18:37:18 2012 @@ -79,7 +79,7 @@ class Threaded_result_queue(Result_queue): def __init__(self, processor): super(Threaded_result_queue, self).__init__(processor) - self.queue = Queue.Queue() + self.queue = queue.Queue() self.sleep_time = 0.05 self.processor = processor self.running = 1