- fix to expression filters so that string conversion (actually unicode) properly

occurs before filtering
- removed encoding() filter - it conflicts with the fact that unicode conversion has to
occur on the value first before being sent to the filter.  recommended way for encoded
strings is to just say unicode(x, encoding='whatever')

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/mako/codegen.py b/lib/mako/codegen.py
index 7396769..efb67cc 100644
--- a/lib/mako/codegen.py
+++ b/lib/mako/codegen.py
@@ -398,8 +398,8 @@ class _GenerateRenderMethod(object):
     def visitExpression(self, node):
         self.write_source_comment(node)
         if len(node.escapes) or (self.compiler.pagetag is not None and len(self.compiler.pagetag.filter_args.args)):
-            s = self.create_filter_callable(node.escapes_code.args, node.text)
-            self.printer.writeline("context.write(unicode(%s))" % s)
+            s = self.create_filter_callable(node.escapes_code.args, "unicode(%s)" % node.text)
+            self.printer.writeline("context.write(%s)" % s)
         else:
             self.printer.writeline("context.write(unicode(%s))" % node.text)