From d8e2be459f97f1773c7edf7d37de180139146176 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Thu, 2 Aug 2018 21:56:26 -0400
Subject: [PATCH] Fixed #29627 -- Fixed QueryDict.urlencode() crash with
 non-string values.

Regression in 7d96f0c49ab750799860e42716d7105e11de44de.
---
 django/http/request.py      | 2 +-
 docs/releases/2.1.1.txt     | 3 +++
 tests/httpwrappers/tests.py | 7 +++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/django/http/request.py b/django/http/request.py
index 05aa89252b..fdd1cf8c67 100644
--- a/django/http/request.py
+++ b/django/http/request.py
@@ -511,7 +511,7 @@ class QueryDict(MultiValueDict):
                 return urlencode({k: v})
         for k, list_ in self.lists():
             output.extend(
-                encode(k.encode(self.encoding), v.encode(self.encoding))
+                encode(k.encode(self.encoding), str(v).encode(self.encoding))
                 for v in list_
             )
         return '&'.join(output)
diff --git a/docs/releases/2.1.1.txt b/docs/releases/2.1.1.txt
index dd9662118d..b9ac90e33b 100644
--- a/docs/releases/2.1.1.txt
+++ b/docs/releases/2.1.1.txt
@@ -11,3 +11,6 @@ Bugfixes
 
 * Fixed a race condition in ``QuerySet.update_or_create()`` that could result
   in data loss (:ticket:`29499`).
+
+* Fixed a regression where ``QueryDict.urlencode()`` crashed if the dictionary
+  contains a non-string value (:ticket:`29627`).
diff --git a/tests/httpwrappers/tests.py b/tests/httpwrappers/tests.py
index 24260ae610..01ce20f93d 100644
--- a/tests/httpwrappers/tests.py
+++ b/tests/httpwrappers/tests.py
@@ -114,6 +114,13 @@ class QueryDictTests(SimpleTestCase):
         self.assertEqual(q.urlencode(), 'next=%2Ft%C3%ABst%26key%2F')
         self.assertEqual(q.urlencode(safe='/'), 'next=/t%C3%ABst%26key/')
 
+    def test_urlencode_int(self):
+        # Normally QueryDict doesn't contain non-string values but lazily
+        # written tests may make that mistake.
+        q = QueryDict(mutable=True)
+        q['a'] = 1
+        self.assertEqual(q.urlencode(), 'a=1')
+
     def test_mutable_copy(self):
         """A copy of a QueryDict is mutable."""
         q = QueryDict().copy()