summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Ronacher <armin.ronacher@active-4.com>2015-11-20 10:05:12 +0100
committerArmin Ronacher <armin.ronacher@active-4.com>2015-11-20 10:05:12 +0100
commit8189d2164dd671c7607771cc132c684f512b8bee (patch)
tree0320f5e8d3349c2e37334777c586a35a1f8a6348
parentf51862d6ca2bf32b315350ac61e4eb1e91ee6801 (diff)
downloadjinja2-8189d2164dd671c7607771cc132c684f512b8bee.tar.gz
Fixed for_qs for urlencode. This fixes #515
-rw-r--r--CHANGES2
-rw-r--r--jinja2/utils.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 987a168..4e5df26 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,8 @@ Version 2.8.1
(unreleased bugfix release)
+- Fixed the `for_qs` flag for `urlencode`.
+
Version 2.8
-----------
(codename Replacement, released on July 26th 2015)
diff --git a/jinja2/utils.py b/jinja2/utils.py
index cdd4cd3..612d5c3 100644
--- a/jinja2/utils.py
+++ b/jinja2/utils.py
@@ -295,7 +295,7 @@ def unicode_urlencode(obj, charset='utf-8', for_qs=False):
obj = text_type(obj)
if isinstance(obj, text_type):
obj = obj.encode(charset)
- safe = for_qs and b'' or b'/'
+ safe = not for_qs and b'/' or b''
rv = text_type(url_quote(obj, safe))
if for_qs:
rv = rv.replace('%20', '+')