Refs #31877 -- Reverted "Fixes #31877 -- Used lazy() for TemplateView kwarg deprecation warning."

felixxm · felixxm · commit 04e87e79a0bd · 2020-08-24T11:37:59.000+02:00
This reverts commit 20799cc.
diff --git a/django/views/generic/base.py b/django/views/generic/base.py
@@ -11,7 +11,7 @@
 from django.urls import reverse
 from django.utils.decorators import classonlymethod
 from django.utils.deprecation import RemovedInDjango40Warning
-from django.utils.functional import lazy
+from django.utils.functional import SimpleLazyObject
 
 logger = logging.getLogger('django.request')
 
@@ -169,6 +169,7 @@ def _wrap_url_kwargs_with_deprecation_warning(url_kwargs):
     context_kwargs = {}
     for key, value in url_kwargs.items():
         # Bind into function closure.
+        @SimpleLazyObject
         def access_value(key=key, value=value):
             warnings.warn(
                 'TemplateView passing URL kwargs to the context is '
@@ -177,7 +178,7 @@ def access_value(key=key, value=value):
                 RemovedInDjango40Warning, stacklevel=2,
             )
             return value
-        context_kwargs[key] = lazy(access_value, type(value))()
+        context_kwargs[key] = access_value
     return context_kwargs
 
 
diff --git a/docs/releases/3.1.1.txt b/docs/releases/3.1.1.txt
@@ -26,10 +26,6 @@ Bugfixes
   related fields pointing to a proxy model in the ``of`` argument, the
   corresponding model was not locked (:ticket:`31866`).
 
-* Fixed a regression in Django 3.1 that caused a crash when passing deprecated
-  keyword arguments to a queryset in ``TemplateView.get_context_data()``
-  (:ticket:`31877`).
-
 * Fixed a data loss possibility, following a regression in Django 2.0, when
   copying model instances with a cached fields value (:ticket:`31863`).
 
diff --git a/tests/generic_views/test_base.py b/tests/generic_views/test_base.py
@@ -3,16 +3,14 @@
 from django.core.exceptions import ImproperlyConfigured
 from django.http import HttpResponse
 from django.test import (
-    RequestFactory, SimpleTestCase, TestCase, ignore_warnings,
-    override_settings,
+    RequestFactory, SimpleTestCase, ignore_warnings, override_settings,
 )
 from django.test.utils import require_jinja2
 from django.urls import resolve
 from django.utils.deprecation import RemovedInDjango40Warning
 from django.views.generic import RedirectView, TemplateView, View
 
 from . import views
-from .models import Artist
 
 
 class SimpleView(View):
@@ -573,9 +571,7 @@ def test_template_mixin_without_template(self):
 
 
 @override_settings(ROOT_URLCONF='generic_views.urls')
-class DeprecationTests(TestCase):
-    rf = RequestFactory()
-
+class DeprecationTests(SimpleTestCase):
     @ignore_warnings(category=RemovedInDjango40Warning)
     def test_template_params(self):
         """A generic template view passes kwargs as context."""
@@ -607,17 +603,3 @@ def test_template_params_warning(self):
             str(response.context['foo2'])
         self.assertEqual(response.context['key'], 'value')
         self.assertIsInstance(response.context['view'], View)
-
-    @ignore_warnings(category=RemovedInDjango40Warning)
-    def test_template_params_filtering(self):
-        class ArtistView(TemplateView):
-            template_name = 'generic_views/about.html'
-
-            def get_context_data(self, *, artist_name, **kwargs):
-                context = super().get_context_data(**kwargs)
-                artist = Artist.objects.get(name=artist_name)
-                return {**context, 'artist': artist}
-
-        artist = Artist.objects.create(name='Rene Magritte')
-        response = ArtistView.as_view()(self.rf.get('/'), artist_name=artist.name)
-        self.assertEqual(response.context_data['artist'], artist)
