Fixed #30677 -- Improved error message for urlencode() and Client when None is passed as data.

1 files changed, 5 insertions, 4 deletions

diff --git a/django/utils/http.py b/django/utils/http.py
index b6a78184a6..050375832c 100644
--- a/django/utils/http.py
+++ b/django/utils/http.py
@@ -113,8 +113,8 @@ def urlencode(query, doseq=False):
     for key, value in query:
         if value is None:
             raise TypeError(
-                'Cannot encode None in a query string. Did you mean to pass '
-                'an empty string or omit the value?'
+                "Cannot encode None for key '%s' in a query string. Did you "
+                "mean to pass an empty string or omit the value?" % key
             )
         elif not doseq or isinstance(value, (str, bytes)):
             query_val = value
@@ -130,8 +130,9 @@ def urlencode(query, doseq=False):
                 for item in itr:
                     if item is None:
                         raise TypeError(
-                            'Cannot encode None in a query string. Did you '
-                            'mean to pass an empty string or omit the value?'
+                            "Cannot encode None for key '%s' in a query "
+                            "string. Did you mean to pass an empty string or "
+                            "omit the value?" % key
                         )
                     elif not isinstance(item, bytes):
                         item = str(item)