r7740 - in /branches/multi_processor_merge/multi: commands.py uni_processor.py -- October 16, 2008 - 00:42

Author: bugman
Date: Thu Oct 16 00:42:05 2008
New Revision: 7740

URL: http://svn.gna.org/viewcvs/relax?rev=7740&view=rev
Log:
Import fixes and clean ups and addition of module docstrings.


Modified:
    branches/multi_processor_merge/multi/commands.py
    branches/multi_processor_merge/multi/uni_processor.py

Modified: branches/multi_processor_merge/multi/commands.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/multi/commands.py?rev=7740&r1=7739&r2=7740&view=diff
==============================================================================
--- branches/multi_processor_merge/multi/commands.py (original)
+++ branches/multi_processor_merge/multi/commands.py Thu Oct 16 00:42:05 2008
@@ -2,7 +2,6 @@
 #                                                                            
  #
 # Copyright (C) 2007  Gary S Thompson (see 
https://gna.org/users/varioustoxins #
 #                                      for contact details)                  
  #
-#                                                                            
  #
 #                                                                            
  #
 # This file is part of the program relax.                                    
  #
 #                                                                            
  #
@@ -22,22 +21,21 @@
 #                                                                            
  #
 
################################################################################
 
-
-from multi.processor import Memo,Slave_command
-from multi.processor import Result_command,Result_string
-from re import match
-
-from maths_fns.mf import Mf
-from minimise.generic import generic_minimise
-
-import minimise
+# Module docstring.
+"""Module for the multi-processor command system."""
+
+# Python module imports.
 import sys
 import traceback
-from processor import Capturing_exception
-
-
-from minimise.generic import set_pre_and_post_amble as 
set_generic_pre_and_post_amble
-from minimise.grid import set_pre_and_post_amble as 
set_grid_pre_and_post_amble
+from re import match
+
+# relax module imports.
+from maths_fns.mf import Mf
+#from minimise.generic import generic_minimise
+#from minimise.generic import set_pre_and_post_amble as 
set_generic_pre_and_post_amble
+#from minimise.grid import set_pre_and_post_amble as 
set_grid_pre_and_post_amble
+from multi.processor import Capturing_exception, Memo, Result_command, 
Result_string, Slave_command
+
 
 class Exit_command(Slave_command):
     def __init__(self):

Modified: branches/multi_processor_merge/multi/uni_processor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/multi/uni_processor.py?rev=7740&r1=7739&r2=7740&view=diff
==============================================================================
--- branches/multi_processor_merge/multi/uni_processor.py (original)
+++ branches/multi_processor_merge/multi/uni_processor.py Thu Oct 16 00:42:05 
2008
@@ -2,7 +2,6 @@
 #                                                                            
  #
 # Copyright (C) 2007  Gary S Thompson (see 
https://gna.org/users/varioustoxins #
 #                                      for contact details)                  
  #
-#                                                                            
  #
 #                                                                            
  #
 # This file is part of the program relax.                                    
  #
 #                                                                            
  #
@@ -21,12 +20,19 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  
  #
 #                                                                            
  #
 
################################################################################
-from errors import RelaxWarnings
+
+# Module docstring.
+"""Module containing the uni-processor class."""
+
+# Python module imports.
 import threading, Queue
 import sys,os
+
+# relax module imports.
 import multi
+from multi.processor import Processor, Result_command, Result_string
 
-from multi.processor import Processor,Result_command,Result_string
+
 #class Processor(object):
 #    def add_to_queue(self,command,memo=None):
 #        pass