test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[2.2.x] Fixed #30437 -- Clarified that urlpatterns can be a sequence. 

Backport of 8aad3321ed from master
This commit is contained in:
Jonatas C. Damasceno 2019-05-06 17:54:11 +02:00 committed by Mariusz Felisiak
parent 5d1cf9c442
commit 72fe36c246
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/topics/http/urls.txt
View File

@ -41,8 +41,8 @@ algorithm the system follows to determine which Python code to execute:
:setting:`ROOT_URLCONF` setting. :setting:`ROOT_URLCONF` setting.
#. Django loads that Python module and looks for the variable #. Django loads that Python module and looks for the variable
``urlpatterns``. This should be a Python list of :func:`django.urls.path` ``urlpatterns``. This should be a :term:`sequence` of
and/or :func:`django.urls.re_path` instances. :func:`django.urls.path` and/or :func:`django.urls.re_path` instances.
#. Django runs through each URL pattern, in order, and stops at the first #. Django runs through each URL pattern, in order, and stops at the first
one that matches the requested URL. one that matches the requested URL.
@ -317,8 +317,8 @@ accessed. This makes the system blazingly fast.
Syntax of the ``urlpatterns`` variable Syntax of the ``urlpatterns`` variable
====================================== ======================================
``urlpatterns`` should be a Python list of :func:`~django.urls.path` and/or ``urlpatterns`` should be a :term:`sequence` of :func:`~django.urls.path`
:func:`~django.urls.re_path` instances. and/or :func:`~django.urls.re_path` instances.
Error handling Error handling
============== ==============