From e954889640fabb262264b3178069b0e8338b1fea Mon Sep 17 00:00:00 2001 From: Keith Mitchell Date: Thu, 18 Oct 2012 14:20:26 -0700 Subject: [PATCH] query_string(): mako.url_escape expects unicode --- r2/r2/lib/utils/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/r2/r2/lib/utils/utils.py b/r2/r2/lib/utils/utils.py index 7fdcb5e2f..1cf366da8 100644 --- a/r2/r2/lib/utils/utils.py +++ b/r2/r2/lib/utils/utils.py @@ -367,8 +367,8 @@ def query_string(dict): for k,v in dict.iteritems(): if v is not None: try: - k = url_escape(unicode(k).encode('utf-8')) - v = url_escape(unicode(v).encode('utf-8')) + k = url_escape(_force_unicode(k)) + v = url_escape(_force_unicode(v)) pairs.append(k + '=' + v) except UnicodeDecodeError: continue