summaryrefslogtreecommitdiff
path: root/docs/intro/tutorial03.txt
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-04-01 20:46:34 -0400
committerTim Graham <timograham@gmail.com>2014-04-03 07:28:10 -0400
commitd73d0e071c1b4c86d57994a0ab55a74cfe80cdf5 (patch)
treef36eebaf1cdd8bd07503b3a538e7d875ff8d29b4 /docs/intro/tutorial03.txt
parente6ced2bb086396b57601d04ad5b3ba347d1eb785 (diff)
Fixed #22218 -- Deprecated django.conf.urls.patterns.
Thanks Carl Meyer for the suggestion and Alex Gaynor and Carl for reviews.
Diffstat (limited to 'docs/intro/tutorial03.txt')
-rw-r--r--docs/intro/tutorial03.txt24
1 files changed, 12 insertions, 12 deletions
diff --git a/docs/intro/tutorial03.txt b/docs/intro/tutorial03.txt
index 5b2bee5fe7..3d4f65a720 100644
--- a/docs/intro/tutorial03.txt
+++ b/docs/intro/tutorial03.txt
@@ -92,13 +92,13 @@ In the ``polls/urls.py`` file include the following code:
.. snippet::
:filename: polls/urls.py
- from django.conf.urls import patterns, url
+ from django.conf.urls import url
from polls import views
- urlpatterns = patterns('',
+ urlpatterns = [
url(r'^$', views.index, name='index')
- )
+ ]
The next step is to point the root URLconf at the ``polls.urls`` module. In
``mysite/urls.py`` insert an :func:`~django.conf.urls.include`, leaving you
@@ -107,13 +107,13 @@ with:
.. snippet::
:filename: mysite/urls.py
- from django.conf.urls import patterns, include, url
+ from django.conf.urls import include, url
from django.contrib import admin
- urlpatterns = patterns('',
+ urlpatterns = [
url(r'^polls/', include('polls.urls')),
url(r'^admin/', include(admin.site.urls)),
- )
+ ]
.. admonition:: Doesn't match what you see?
@@ -207,11 +207,11 @@ Wire these new views into the ``polls.urls`` module by adding the following
.. snippet::
:filename: polls/urls.py
- from django.conf.urls import patterns, url
+ from django.conf.urls import url
from polls import views
- urlpatterns = patterns('',
+ urlpatterns = [
# ex: /polls/
url(r'^$', views.index, name='index'),
# ex: /polls/5/
@@ -220,7 +220,7 @@ Wire these new views into the ``polls.urls`` module by adding the following
url(r'^(?P<question_id>\d+)/results/$', views.results, name='results'),
# ex: /polls/5/vote/
url(r'^(?P<question_id>\d+)/vote/$', views.vote, name='vote'),
- )
+ ]
Take a look in your browser, at "/polls/34/". It'll run the ``detail()``
method and display whatever ID you provide in the URL. Try
@@ -583,13 +583,13 @@ it to include namespacing:
.. snippet::
:filename: mysite/urls.py
- from django.conf.urls import patterns, include, url
+ from django.conf.urls import include, url
from django.contrib import admin
- urlpatterns = patterns('',
+ urlpatterns = [
url(r'^polls/', include('polls.urls', namespace="polls")),
url(r'^admin/', include(admin.site.urls)),
- )
+ ]
Now change your ``polls/index.html`` template from: