Author: bugman Date: Thu Aug 25 11:41:18 2011 New Revision: 14428 URL: http://svn.gna.org/viewcvs/relax?rev=14428&view=rev Log: Deleted the STDOUT and STDERR capture mess in MF_minimise_command! This was a horrible design breaking both the GUI and the test suite!!! Modified: 1.3/specific_fns/model_free/multi_processor_commands.py Modified: 1.3/specific_fns/model_free/multi_processor_commands.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/multi_processor_commands.py?rev=14428&r1=14427&r2=14428&view=diff ============================================================================== --- 1.3/specific_fns/model_free/multi_processor_commands.py (original) +++ 1.3/specific_fns/model_free/multi_processor_commands.py Thu Aug 25 11:41:18 2011 @@ -1,7 +1,7 @@ ############################################################################### # # # Copyright (C) 2007 Gary S Thompson (https://gna.org/users/varioustoxins) # -# Copyright (C) 2008, 2010 Edward d'Auvergne # +# Copyright (C) 2008-2011 Edward d'Auvergne # # # # This file is part of the program relax. # # # @@ -134,15 +134,7 @@ # Disassemble the results list. param_vector, func, iter, fc, gc, hc, warning = results - # Get the STDOUT and STDERR messages. - #FIXME: we need to interleave stdout and stderr - (stdout, stderr)= processor.get_stdio_capture() - result_string = stdout.getvalue() + stderr.getvalue() - stdout.truncate(0) - stderr.truncate(0) - processor.return_object(MF_result_command(processor, self.memo_id, param_vector, func, iter, fc, gc, hc, warning, completed=False)) - processor.return_object(Result_string(processor, result_string, completed=completed)) # An error occurred. except Exception, e :