r15400 - in /1.3/multi: mpi4py_processor.py multi_processor_base.py processor.py -- February 29, 2012 - 10:49

Author: bugman
Date: Wed Feb 29 10:49:46 2012
New Revision: 15400

URL: http://svn.gna.org/viewcvs/relax?rev=15400&view=rev
Log:
Eliminated all usage of sys.__stdout__ and sys.__stderr__ in the 
multi-processor package.

This returns full control of IO streams to the parent program.


Modified:
    1.3/multi/mpi4py_processor.py
    1.3/multi/multi_processor_base.py
    1.3/multi/processor.py

Modified: 1.3/multi/mpi4py_processor.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/multi/mpi4py_processor.py?rev=15400&r1=15399&r2=15400&view=diff
==============================================================================
--- 1.3/multi/mpi4py_processor.py (original)
+++ 1.3/multi/mpi4py_processor.py Wed Feb 29 10:49:46 2012
@@ -1,7 +1,7 @@
 
###############################################################################
 #                                                                            
 #
 # Copyright (C) 2007 Gary S Thompson (https://gna.org/users/varioustoxins)   
 #
-# Copyright (C) 2010 Edward d'Auvergne                                       
 #
+# Copyright (C) 2010-2012 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax.                                    
 #
 #                                                                            
 #
@@ -70,13 +70,13 @@
         if in_main_loop:
             raise Exception('sys.exit unexpectedley called on slave!')
         else:
-            sys.__stderr__.write('\n')
-            
sys.__stderr__.write('***********************************************\n')
-            sys.__stderr__.write('\n')
-            sys.__stderr__.write('warning sys.exit called before mpi4py main 
loop\n')
-            sys.__stderr__.write('\n')
-            
sys.__stderr__.write('***********************************************\n')
-            sys.__stderr__.write('\n')
+            sys.stderr.write('\n')
+            
sys.stderr.write('***********************************************\n')
+            sys.stderr.write('\n')
+            sys.stderr.write('warning sys.exit called before mpi4py main 
loop\n')
+            sys.stderr.write('\n')
+            
sys.stderr.write('***********************************************\n')
+            sys.stderr.write('\n')
             MPI.COMM_WORLD.Abort()
 
     # Execution on the master.

Modified: 1.3/multi/multi_processor_base.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/multi/multi_processor_base.py?rev=15400&r1=15399&r2=15400&view=diff
==============================================================================
--- 1.3/multi/multi_processor_base.py (original)
+++ 1.3/multi/multi_processor_base.py Wed Feb 29 10:49:46 2012
@@ -192,7 +192,7 @@
 
             elif isinstance(result, Result_string):
                 #FIXME can't cope with multiple lines
-                sys.__stdout__.write(result.string)
+                sys.stdout.write(result.string)
         else:
             message = 'Unexpected result type \n%s \nvalue%s' 
%(result.__class__.__name__, result)
             raise Exception(message)

Modified: 1.3/multi/processor.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/multi/processor.py?rev=15400&r1=15399&r2=15400&view=diff
==============================================================================
--- 1.3/multi/processor.py (original)
+++ 1.3/multi/processor.py Wed Feb 29 10:49:46 2012
@@ -851,7 +851,7 @@
 class Result_string(Result):
     '''A simple result from a slave containing a result.
 
-    The processor will print this string via sys.__stdout__.
+    The processor will print this string via sys.stdout.
 
     @note:  This may become a result_command so as to simplify things in the 
end.
     '''