summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkundan223 <kundan0707y@gmail.com>2025-12-14 13:02:25 +0530
committerNatalia <124304+nessita@users.noreply.github.com>2025-12-26 09:25:51 -0300
commitd35daf8600a66c0ff20e36f82969df61a7fc4981 (patch)
tree696161deb19a6b8467879c5b5b2359ba4a623b1b
parent16107ab710dc23d5ea0aa17da6bf29fe89b61bb0 (diff)
[6.0.x] Fixed #36796 -- Handled lazy routes correctly in RoutePattern.match().
Coerce lazy route values to `str` at match time to support prefix and endpoint matching when using `gettext_lazy()` route paths. Regression in f920937c8a63df6bea220e4386f59cdb45b2e355. Thanks to Andrea Angelini for the report, and to Jake Howard and Jacob Walls for reviews. Co-authored-by: Natalia <124304+nessita@users.noreply.github.com> Backport of 7bf3ac3ee255bcfe329e3203c7a2555b1275d506 from main.
-rw-r--r--django/urls/resolvers.py4
-rw-r--r--docs/releases/6.0.1.txt4
-rw-r--r--tests/urlpatterns/lazy_path_urls.py9
-rw-r--r--tests/urlpatterns/test_resolvers.py31
4 files changed, 46 insertions, 2 deletions
diff --git a/django/urls/resolvers.py b/django/urls/resolvers.py
index bad5490dcb..6c681f9d8d 100644
--- a/django/urls/resolvers.py
+++ b/django/urls/resolvers.py
@@ -341,8 +341,8 @@ class RoutePattern(CheckURLMixin):
if self._route == path:
return "", (), {}
# If this isn't an endpoint, the path should start with the route.
- elif path.startswith(self._route):
- return path.removeprefix(self._route), (), {}
+ elif path.startswith(route := str(self._route)):
+ return path.removeprefix(route), (), {}
return None
def check(self):
diff --git a/docs/releases/6.0.1.txt b/docs/releases/6.0.1.txt
index 90158b6ff2..753d2c87ad 100644
--- a/docs/releases/6.0.1.txt
+++ b/docs/releases/6.0.1.txt
@@ -31,3 +31,7 @@ Bugfixes
* Fixed a crash in Django 6.0 caused by infinite recursion when calling
``repr()`` on an unevaluated ``django.utils.csp.LazyNonce`` instance
(:ticket:`36810`).
+
+* Fixed a regression in Django 6.0 where :func:`~django.urls.path` routes
+ defined using :func:`~django.utils.translation.gettext_lazy` failed to
+ resolve correctly (:ticket:`36796`).
diff --git a/tests/urlpatterns/lazy_path_urls.py b/tests/urlpatterns/lazy_path_urls.py
new file mode 100644
index 0000000000..01fcfcb3ae
--- /dev/null
+++ b/tests/urlpatterns/lazy_path_urls.py
@@ -0,0 +1,9 @@
+from django.urls import include, path
+from django.utils.translation import gettext_lazy as _
+
+from . import views
+
+urlpatterns = [
+ path(_("included_urls/"), include("urlpatterns.included_urls")),
+ path(_("lazy/<slug:slug>/"), views.empty_view, name="lazy"),
+]
diff --git a/tests/urlpatterns/test_resolvers.py b/tests/urlpatterns/test_resolvers.py
index 99b2f9154c..f61456a921 100644
--- a/tests/urlpatterns/test_resolvers.py
+++ b/tests/urlpatterns/test_resolvers.py
@@ -3,6 +3,8 @@ from django.test.utils import override_settings
from django.urls.resolvers import RegexPattern, RoutePattern, get_resolver
from django.utils.translation import gettext_lazy as _
+from . import views
+
class RegexPatternTests(SimpleTestCase):
def test_str(self):
@@ -19,6 +21,21 @@ class RoutePatternTests(SimpleTestCase):
self.assertEqual(len(RoutePattern("translated/<int:foo>").converters), 1)
self.assertEqual(len(RoutePattern(_("translated/<int:foo>")).converters), 1)
+ def test_match_lazy_route_without_converters(self):
+ pattern = RoutePattern(_("test/"))
+ result = pattern.match("test/child/")
+ self.assertEqual(result, ("child/", (), {}))
+
+ def test_match_lazy_route_endpoint(self):
+ pattern = RoutePattern(_("test/"), is_endpoint=True)
+ result = pattern.match("test/")
+ self.assertEqual(result, ("", (), {}))
+
+ def test_match_lazy_route_with_converters(self):
+ pattern = RoutePattern(_("test/<int:pk>/"))
+ result = pattern.match("test/123/child/")
+ self.assertEqual(result, ("child/", (), {"pk": 123}))
+
class ResolverCacheTests(SimpleTestCase):
@override_settings(ROOT_URLCONF="urlpatterns.path_urls")
@@ -27,3 +44,17 @@ class ResolverCacheTests(SimpleTestCase):
# settings.ROOT_URLCONF is the same cached object.
self.assertIs(get_resolver(), get_resolver("urlpatterns.path_urls"))
self.assertIsNot(get_resolver(), get_resolver("urlpatterns.path_dynamic_urls"))
+
+
+class ResolverLazyIncludeTests(SimpleTestCase):
+
+ def test_lazy_route_resolves(self):
+ resolver = get_resolver("urlpatterns.lazy_path_urls")
+ for url_path, name in [
+ ("/lazy/test-me/", "lazy"),
+ ("/included_urls/extra/test/", "inner-extra"),
+ ]:
+ with self.subTest(name=name):
+ match = resolver.resolve(url_path)
+ self.assertEqual(match.func, views.empty_view)
+ self.assertEqual(match.url_name, name)