r14403 - in /branches/gui_testing: ./ multi/multi_processor_base.py -- August 22, 2011 - 14:51

Author: bugman
Date: Mon Aug 22 14:51:53 2011
New Revision: 14403

URL: http://svn.gna.org/viewcvs/relax?rev=14403&view=rev
Log:
Merged revisions 14396,14401 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r14396 | bugman | 2011-08-17 16:32:45 +0200 (Wed, 17 Aug 2011) | 3 lines
  
  Removed some used, commented out code.
........
  r14401 | bugman | 2011-08-22 14:46:03 +0200 (Mon, 22 Aug 2011) | 16 lines
  
  Merged r14393 in from the gui_testing branch as the change should have been 
in the main line.
  
  The command used was:
  svn merge -r14393:14394 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/gui_testing .
  
  .....
    r14394 | bugman | 2011-08-16 21:13:44 +0200 (Tue, 16 Aug 2011) | 5 lines
    Changed paths:
       M /branches/gui_testing/relax.py
    
    Fix for the GUI mode setting which was broken in r14393.
    
    The multi-processor code merger caused this to be an issue, as the mode 
is now a class variable.
  .....
........

Modified:
    branches/gui_testing/   (props changed)
    branches/gui_testing/multi/multi_processor_base.py

Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Aug 22 14:51:53 2011
@@ -1,1 +1,1 @@
-/1.3:1-14392
+/1.3:1-14402

Modified: branches/gui_testing/multi/multi_processor_base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/multi/multi_processor_base.py?rev=14403&r1=14402&r2=14403&view=diff
==============================================================================
--- branches/gui_testing/multi/multi_processor_base.py (original)
+++ branches/gui_testing/multi/multi_processor_base.py Mon Aug 22 14:51:53 
2011
@@ -144,16 +144,8 @@
 
 
     def post_run(self):
+
         self.restore_stdio()
-
-#        if self.processor_size() > 1:
-#           if id(sys.stderr) != id(sys.__stderr__):
-#               sys.stderr.close()
-#               sys.stderr = sys.__stderr__
-#
-#           if id(sys.stdout) != id(sys.__stdout__):
-#               sys.stdout.close()
-#               sys.stdout = sys.__stdout__
 
         super(Multi_processor, self).post_run()