[Mpuls-commits] r2341 - wasko/branches/2.0/mpulsweb/controllers

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-04-14 12:49:57 +0200 (Wed, 14 Apr 2010)
New Revision: 2341

Modified:
   wasko/branches/2.0/mpulsweb/controllers/logbook.py
Log:
* mpulsweb/controllers/logbook.py (LogbookController): Do not convert
to unicode in render functions.


Modified: wasko/branches/2.0/mpulsweb/controllers/logbook.py
===================================================================
--- wasko/branches/2.0/mpulsweb/controllers/logbook.py	2010-04-14 10:47:58 UTC (rev 2340)
+++ wasko/branches/2.0/mpulsweb/controllers/logbook.py	2010-04-14 10:49:57 UTC (rev 2341)
@@ -127,7 +127,7 @@
         form_defaults['case_id'] = id
 
         form = render('/logbook/new.mako')
-        return formencode.htmlfill.render(unicode(form, 'utf-8'),
+        return formencode.htmlfill.render(form,
                                           defaults=form_defaults,
                                           auto_insert_errors=False,
                                           errors=c.form_errors)
@@ -145,7 +145,7 @@
             c.form_result = error.value
             c.form_errors = error.error_dict or {}
             form = render('/logbook/new.mako')
-            return formencode.htmlfill.render(unicode(form, 'utf-8'),
+            return formencode.htmlfill.render(form,
                                               defaults=c.form_result,
                                               auto_insert_errors=False,
                                               errors=c.form_errors)
@@ -188,7 +188,7 @@
             entry_data['short_notice'] = entry.getShortNotice()
             c.entry = entry
             form = render('/logbook/edit.mako')
-            return formencode.htmlfill.render(unicode(form, 'utf-8'),
+            return formencode.htmlfill.render(form,
                                               defaults=entry_data,
                                               auto_insert_errors=False,
                                               errors={})
@@ -212,7 +212,7 @@
             c.form_result = error.value
             c.form_errors = error.error_dict or {}
             form = render('/logbook/new.mako')
-            return formencode.htmlfill.render(unicode(form, 'utf-8'),
+            return formencode.htmlfill.render(form,
                                               defaults=c.form_result,
                                               auto_insert_errors=False,
                                               errors=c.form_errors)