[Greater-commits] r3686 - in branches/3.0.0-all-models/GREAT-ER: . Greater/Modules

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-26 11:40:39 +0200 (Tue, 26 Jul 2011)
New Revision: 3686

Modified:
   branches/3.0.0-all-models/GREAT-ER/
   branches/3.0.0-all-models/GREAT-ER/ChangeLog
   branches/3.0.0-all-models/GREAT-ER/Greater/Modules/catchment.py
Log:
Merged revisions 3623 via svnmerge from 
svn+ssh://wald.intevation.org/greater/trunk/GREAT-ER

........
  r3623 | aheinecke | 2011-07-20 14:59:50 +0200 (Wed, 20 Jul 2011) | 2 lines
  
  Do not explicitly cast the string type to ascii it can also be unicode
........



Property changes on: branches/3.0.0-all-models/GREAT-ER
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/GREAT-ER:1-232,310,312-315,319,322,327,333,335,340-344,346-347,368,375,397-398,400,403,410,412-431,434-448,3577-3578,3604-3606,3611,3613-3618,3620
   + /trunk/GREAT-ER:1-232,310,312-315,319,322,327,333,335,340-344,346-347,368,375,397-398,400,403,410,412-431,434-448,3577-3578,3604-3606,3611,3613-3618,3620,3623

Modified: branches/3.0.0-all-models/GREAT-ER/ChangeLog
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-26 09:38:59 UTC (rev 3685)
+++ branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-26 09:40:39 UTC (rev 3686)
@@ -13,6 +13,9 @@
 	* Greater/Modules/analysis.py:
 		- Remove num_classes parameter from generate_singletons which
 		  is no longer necessary because of the new ramps in Thuban.
+	* Greater/Modules/catchment.py:
+		- Do not explicitly cast stringtypes to ascii since they also
+		  can be unicode
 
 2011-07-25  Andre Heinecke <aheinecke at intevation.de>
 

Modified: branches/3.0.0-all-models/GREAT-ER/Greater/Modules/catchment.py
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/Greater/Modules/catchment.py	2011-07-26 09:38:59 UTC (rev 3685)
+++ branches/3.0.0-all-models/GREAT-ER/Greater/Modules/catchment.py	2011-07-26 09:40:39 UTC (rev 3686)
@@ -207,7 +207,7 @@
                     value = None
                 return value
             elif f[1] == FIELDTYPE_STRING:
-                return str(v)
+                return v
             return v
     
         for r in records: