Author: bugman Date: Wed Feb 29 11:03:48 2012 New Revision: 15402 URL: http://svn.gna.org/viewcvs/relax?rev=15402&view=rev Log: Fix for the Immediate_result_queue class. The __init__() method was broken! Modified: 1.3/multi/multi_processor_base.py Modified: 1.3/multi/multi_processor_base.py URL: http://svn.gna.org/viewcvs/relax/1.3/multi/multi_processor_base.py?rev=15402&r1=15401&r2=15402&view=diff ============================================================================== --- 1.3/multi/multi_processor_base.py (original) +++ 1.3/multi/multi_processor_base.py Wed Feb 29 11:03:48 2012 @@ -84,11 +84,13 @@ processor.process_result(result_command) + class Exit_queue_result_command(Result_command): def __init__(self, completed=True): pass RESULT_QUEUE_EXIT_COMMAND = Exit_queue_result_command() + class Multi_processor(Processor): @@ -336,6 +338,7 @@ raise_unimplemented(self.slave_recieve_commands) + #FIXME: move up a level or more class Result_queue(object): def __init__(self, processor): @@ -351,12 +354,9 @@ raise_unimplemented(self.run_all) + #FIXME: move up a level or more class Immediate_result_queue(Result_queue): - def __init(self, processor): - super(Threaded_result_queue, self).__init__(processor) - - def put(self, job): super(Immediate_result_queue, self).put(job) try: @@ -369,6 +369,7 @@ def run_all(self): pass + class Threaded_result_queue(Result_queue): @@ -407,6 +408,7 @@ self.processor.abort() + class Too_few_slaves_exception(Exception): def __init__(self): msg = 'master slave processing requires at least 2 processors to run you only provided 1, exiting....'