[Greater-commits] r3693 - in branches/3.0.0-all-models/GREAT-ERModel: . GreaterModel/Worker

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-26 12:36:03 +0200 (Tue, 26 Jul 2011)
New Revision: 3693

Modified:
   branches/3.0.0-all-models/GREAT-ERModel/
   branches/3.0.0-all-models/GREAT-ERModel/ChangeLog
   branches/3.0.0-all-models/GREAT-ERModel/GreaterModel/Worker/worker.py
Log:
Merged revisions 3583 via svnmerge from 
svn+ssh://wald.intevation.org/greater/trunk/GREAT-ERModel

........
  r3583 | aheinecke | 2011-07-14 16:56:44 +0200 (Thu, 14 Jul 2011) | 3 lines
  
  Correctly use the string expansion before this codepath lead
  to a TypeError
........



Property changes on: branches/3.0.0-all-models/GREAT-ERModel
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/GREAT-ERModel:1-216,321
   + /trunk/GREAT-ERModel:1-216,321,3583

Modified: branches/3.0.0-all-models/GREAT-ERModel/ChangeLog
===================================================================
--- branches/3.0.0-all-models/GREAT-ERModel/ChangeLog	2011-07-26 10:32:58 UTC (rev 3692)
+++ branches/3.0.0-all-models/GREAT-ERModel/ChangeLog	2011-07-26 10:36:03 UTC (rev 3693)
@@ -1,6 +1,8 @@
 2011-07-26  Andre Heinecke <aheinecke at intevation.de>
 
 	* Worker/simpletreatmodel.py: Use numpy instead of Numeric
+	* Worker/worker.py: Correct Type error by using string representation
+	of a Tuple.
 
 2007-06-20  Frank Koormann <frank.koormann at intevation.de>
 

Modified: branches/3.0.0-all-models/GREAT-ERModel/GreaterModel/Worker/worker.py
===================================================================
--- branches/3.0.0-all-models/GREAT-ERModel/GreaterModel/Worker/worker.py	2011-07-26 10:32:58 UTC (rev 3692)
+++ branches/3.0.0-all-models/GREAT-ERModel/GreaterModel/Worker/worker.py	2011-07-26 10:36:03 UTC (rev 3693)
@@ -132,8 +132,8 @@
             else:
                 # An unknown status of the calculation. Return an error to
                 # the caller of the start_calculation method.
-                err = ValueError("Unknown calculation status %r"
-                                 % (status, progress))
+                err = ValueError("Unknown calculation status %s"
+                                 % repr(status, progress))
                 deferred.errback(err)
         except:
             log.err(Failure())