fixed #276.

--HG--
branch : trunk

diff --git a/jinja/filters.py b/jinja/filters.py
index af05a0edd094099e9b28a96df1c715cbda3199d1..f9199a6bc0f6fd66cba13be2914a72c42c6d8ea8 100644 (file)
--- a/jinja/filters.py
+++ b/jinja/filters.py
@@ -375,10 +375,12 @@ def do_urlencode():
         if isinstance(value, dict):
             tmp = {}
             for key, value in value.iteritems():
-                tmp[env.to_unicode(key)] = env.to_unicode(value)
+                key = env.to_unicode(key).encode(env.charset)
+                value = env.to_unicode(value).encode(env.charset)
+                tmp[key] = value
             return urlencode(tmp)
         else:
-            return quote(env.to_unicode(value))
+            return quote(env.to_unicode(value).encode(env.charset))
     return wrapped