[Mpuls-commits] r1016 - in wasko/branches/2.0: . waskaweb/model

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-29 15:19:01 +0100 (Fri, 29 Jan 2010)
New Revision: 1016

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/model/appointment.py
Log:
* waskaweb/model/appointment.py
(AppointmentFactory.createByDBRow): Use ensure_unicode to convert
to unicode instead of hardcoding the conversion inline.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-01-29 14:17:58 UTC (rev 1015)
+++ wasko/branches/2.0/ChangeLog	2010-01-29 14:19:01 UTC (rev 1016)
@@ -1,5 +1,11 @@
 2010-01-29  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/model/appointment.py
+	(AppointmentFactory.createByDBRow): Use ensure_unicode to convert
+	to unicode instead of hardcoding the conversion inline.
+
+2010-01-29  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/model/case.py (ensure_unicode),
 	waskaweb/lib/helpers.py (ensure_unicode): Move ensure_unicode from
 	case to helpers to make it available to other parts of the code.

Modified: wasko/branches/2.0/waskaweb/model/appointment.py
===================================================================
--- wasko/branches/2.0/waskaweb/model/appointment.py	2010-01-29 14:17:58 UTC (rev 1015)
+++ wasko/branches/2.0/waskaweb/model/appointment.py	2010-01-29 14:19:01 UTC (rev 1016)
@@ -171,8 +171,8 @@
         master_id = row[1]
         sdate     = row[2]
         edate     = row[3]
-        name      = unicode(str(row[4]), 'utf-8')
-        desc      = unicode(str(row[5]), 'utf-8')
+        name      = h.ensure_unicode(row[4])
+        desc      = h.ensure_unicode(row[5])
         type      = row[6]
         return self.createByData(id, name, sdate, edate, desc, master_id, type)