r7727 - in /branches/multi_processor_merge/multi: commands.py uni_processor.py -- October 15, 2008 - 23:12

Author: bugman
Date: Wed Oct 15 23:12:52 2008
New Revision: 7727

URL: http://svn.gna.org/viewcvs/relax?rev=7727&view=rev
Log:
Manually ported r3254 from the multi_processor branch.

The command used was:
svn merge -r3253:3254 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor .

.....
  r3254 | varioustoxins | 2007-03-30 11:26:11 +0200 (Fri, 30 Mar 2007) | 2 
lines
  Changed paths:
     M /branches/multi_processor/multi/commands.py
     M /branches/multi_processor/multi/uni_processor.py

  corrections to keyword passing to dict.update()
.....


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=7727&r1=7726&r2=7727&view=diff
==============================================================================
--- branches/multi_processor_merge/multi/commands.py (original)
+++ branches/multi_processor_merge/multi/commands.py Wed Oct 15 23:12:52 2008
@@ -108,7 +108,7 @@
     def set_mf(self, **kwargs):
         # note the creation of a dict prevents a bug in python 2.3.3  where
         # it complains update doesn't take keywords
-        self.mf_map.update(dict(**kwargs))
+        self.mf_map.update(kwargs)
 
 
     def set_minimise(self,**kwargs):
@@ -121,7 +121,7 @@
            del kwargs['grid_size']
         # note the creation of a dict prevents a bug in python 2.3.3  where
         # it complains update doesn't take keywords
-        self.minimise_map.update(dict(**kwargs))
+        self.minimise_map.update(kwargs)
 
     def build_mf(self):
         return  Mf(**self.mf_map)

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=7727&r1=7726&r2=7727&view=diff
==============================================================================
--- branches/multi_processor_merge/multi/uni_processor.py (original)
+++ branches/multi_processor_merge/multi/uni_processor.py Wed Oct 15 23:12:52 
2008
@@ -24,7 +24,6 @@
 import threading, Queue
 import sys
 import multi
-import time,datetime
 
 from multi.processor import Processor,Result_command,Result_string
 #class Processor(object):