r9453 - in /branches/multi_processor_merge/multi: mpi4py_processor.py multi_processor_base.py -- September 03, 2009 - 15:38

Author: bugman
Date: Thu Sep  3 15:20:11 2009
New Revision: 9453

URL: http://svn.gna.org/viewcvs/relax?rev=9453&view=rev
Log:
Updates for Python3k.

The command used was:
2to3 -w \
-f buffer \
-f idioms \
-f set_literal \
-f ws_comma \
-x except \
-x import \
-x imports \
-x long \
-x numliterals \
-x xrange \
relax .

This is from the docs/2to3_checklist document.


Modified:
    branches/multi_processor_merge/multi/mpi4py_processor.py
    branches/multi_processor_merge/multi/multi_processor_base.py

Modified: branches/multi_processor_merge/multi/mpi4py_processor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/multi/mpi4py_processor.py?rev=9453&r1=9452&r2=9453&view=diff
==============================================================================
--- branches/multi_processor_merge/multi/mpi4py_processor.py (original)
+++ branches/multi_processor_merge/multi/mpi4py_processor.py Thu Sep  3 
15:20:11 2009
@@ -67,7 +67,7 @@
 def ditch_all_results():
     for i in range(1, MPI.COMM_WORLD.size):
         if i != 0:
-            while 1:
+            while True:
                 result = MPI.COMM_WORLD.Recv(source=i)
                 if result.completed:
                     break

Modified: branches/multi_processor_merge/multi/multi_processor_base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/multi/multi_processor_base.py?rev=9453&r1=9452&r2=9453&view=diff
==============================================================================
--- branches/multi_processor_merge/multi/multi_processor_base.py (original)
+++ branches/multi_processor_merge/multi/multi_processor_base.py Thu Sep  3 
15:20:11 2009
@@ -285,7 +285,7 @@
             self.assert_on_master()
 
             running_set = set()
-            idle_set = set([i for i in range(1, self.processor_size()+1)])
+            idle_set = {i for i in range(1, self.processor_size()+1)}
 
             if self.threaded_result_processing:
                 result_queue = Threaded_result_queue(self)