From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Fri, 20 Nov 2015 09:05:12 +0000 (+0100)
Subject: Fixed for_qs for urlencode. This fixes #515
X-Git-Tag: 2.8.1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8189d2164dd671c7607771cc132c684f512b8bee;p=thirdparty%2Fjinja.git

Fixed for_qs for urlencode. This fixes #515
---

diff --git a/CHANGES b/CHANGES
index 987a168c..4e5df26c 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 cdd4cd3a..612d5c3d 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', '+')