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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-29 18:53:50 +0100 (Fri, 29 Jan 2010)
New Revision: 1030

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/model/logbook.py
Log:
* waskaweb/model/logbook.py (LogbookEntry.setByRow): 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 17:49:08 UTC (rev 1029)
+++ wasko/branches/2.0/ChangeLog	2010-01-29 17:53:50 UTC (rev 1030)
@@ -1,5 +1,11 @@
 2010-01-29  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/model/logbook.py (LogbookEntry.setByRow): Use
+	ensure_unicode to convert to unicode instead of hardcoding the
+	conversion inline.
+
+2010-01-29  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/model/logbook.py: Fix formatting
 
 2010-01-29  Bernhard Herzog  <bh at intevation.de>

Modified: wasko/branches/2.0/waskaweb/model/logbook.py
===================================================================
--- wasko/branches/2.0/waskaweb/model/logbook.py	2010-01-29 17:49:08 UTC (rev 1029)
+++ wasko/branches/2.0/waskaweb/model/logbook.py	2010-01-29 17:53:50 UTC (rev 1030)
@@ -148,10 +148,10 @@
     def setByRow(self, row):
         self.id = row[0]
         self.datum = row[1]
-        self.bearbeiter_name = row[2] and unicode(str(row[2]), 'UTF-8') or None
+        self.bearbeiter_name = row[2] and h.ensure_unicode(row[2]) or None
         self.art = row[3]
-        self.kurz_notiz = row[4] and unicode(str(row[4]), 'UTF-8') or None
-        self.notiz = row[5] and unicode(str(row[5]), 'UTF-8') or None
+        self.kurz_notiz = row[4] and h.ensure_unicode(row[4]) or None
+        self.notiz = row[5] and h.ensure_unicode(row[5]) or None
         self.dauer = row[6]
 
     def loadById(self, id):