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

[scm-commit@wald.intevation.org]

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

Modified:
   wasko/branches/2.0/mpulsweb/controllers/administration.py
Log:
Do not convert to unicode in htmlfill-render-function


Modified: wasko/branches/2.0/mpulsweb/controllers/administration.py
===================================================================
--- wasko/branches/2.0/mpulsweb/controllers/administration.py	2010-04-14 10:23:48 UTC (rev 2337)
+++ wasko/branches/2.0/mpulsweb/controllers/administration.py	2010-04-14 10:24:57 UTC (rev 2338)
@@ -111,7 +111,7 @@
             c.form_result = error.value
             c.form_errors = error.error_dict or {}
             form = render('/administration/new_user.mako')
-            return formencode.htmlfill.render(unicode(form, 'utf-8'),
+            return formencode.htmlfill.render(form,
                                               c.form_result, c.form_errors,
                                               auto_insert_errors=False)
 
@@ -323,7 +323,7 @@
             c.form_result = error.value
             c.form_errors = error.error_dict or {}
             form = render('/administration/new_usergroup.mako')
-            return formencode.htmlfill.render(unicode(form, 'utf-8'),
+            return formencode.htmlfill.render(form,
                                    c.form_result,
                                    c.form_errors,
                                    auto_insert_errors=False)
@@ -359,7 +359,7 @@
         admins = userlist.getAdminList()
         c.userlist = userlist.getUserList(filter=[u.id for u in admins])
         form = render('/administration/edit_usergroup.mako')
-        return formencode.htmlfill.render(unicode(form, 'utf-8'),
+        return formencode.htmlfill.render(form,
                                c.form_result,
                                c.form_errors,
                                auto_insert_errors=False)
@@ -391,7 +391,7 @@
             c.group = factory.load(c.form_result.get('id'))
             c.form_errors = error.error_dict or {}
             form = render('/administration/edit_usergroup.mako')
-            return htmlfill.render(unicode(form, 'utf-8'),
+            return htmlfill.render(form,
                                    c.form_result,
                                    c.form_errors,
                                    auto_insert_errors=False)