Author: carljm
Date: 2011-11-06 08:58:04 -0800 (Sun, 06 Nov 2011)
New Revision: 17073
Modified:
django/trunk/docs/intro/tutorial03.txt
django/trunk/docs/intro/tutorial04.txt
Log:
Refs #17171 -- Updated tutorial sections 3 and 4 to follow the startproject
template and consistently use url() function in URLconf. Thanks haimunt for the
report.
Modified: django/trunk/docs/intro/tutorial03.txt
===================================================================
--- django/trunk/docs/intro/tutorial03.txt 2011-11-06 01:19:40 UTC (rev
17072)
+++ django/trunk/docs/intro/tutorial03.txt 2011-11-06 16:58:04 UTC (rev
17073)
@@ -84,10 +84,10 @@
admin.autodiscover()
urlpatterns = patterns('',
- (r'^polls/$', 'polls.views.index'),
- (r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
- (r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
- (r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
+ url(r'^polls/$', 'polls.views.index'),
+ url(r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
+ url(r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
+ url(r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
url(r'^admin/', include(admin.site.urls)),
)
@@ -434,10 +434,10 @@
the URLconf, you may notice there's a fair bit of redundancy in it::
urlpatterns = patterns('',
- (r'^polls/$', 'polls.views.index'),
- (r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
- (r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
- (r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
+ url(r'^polls/$', 'polls.views.index'),
+ url(r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
+ url(r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
+ url(r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
)
Namely, ``polls.views`` is in every callback.
@@ -447,10 +447,10 @@
first argument to :func:`~django.conf.urls.patterns`, like so::
urlpatterns = patterns('polls.views',
- (r'^polls/$', 'index'),
- (r'^polls/(?P<poll_id>\d+)/$', 'detail'),
- (r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
- (r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
+ url(r'^polls/$', 'index'),
+ url(r'^polls/(?P<poll_id>\d+)/$', 'detail'),
+ url(r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
+ url(r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
)
This is functionally identical to the previous formatting. It's just a bit
@@ -467,10 +467,10 @@
admin.autodiscover()
urlpatterns = patterns('polls.views',
- (r'^polls/$', 'index'),
- (r'^polls/(?P<poll_id>\d+)/$', 'detail'),
- (r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
- (r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
+ url(r'^polls/$', 'index'),
+ url(r'^polls/(?P<poll_id>\d+)/$', 'detail'),
+ url(r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
+ url(r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
)
urlpatterns += patterns('',
@@ -497,14 +497,13 @@
``mysite/urls.py`` to remove the poll-specific URLs and insert an
:func:`~django.conf.urls.include`, leaving you with::
- # This also imports the include function
from django.conf.urls import patterns, include, url
from django.contrib import admin
admin.autodiscover()
urlpatterns = patterns('',
- (r'^polls/', include('polls.urls')),
+ url(r'^polls/', include('polls.urls')),
url(r'^admin/', include(admin.site.urls)),
)
@@ -531,10 +530,10 @@
from django.conf.urls import patterns, include, url
urlpatterns = patterns('polls.views',
- (r'^$', 'index'),
- (r'^(?P<poll_id>\d+)/$', 'detail'),
- (r'^(?P<poll_id>\d+)/results/$', 'results'),
- (r'^(?P<poll_id>\d+)/vote/$', 'vote'),
+ url(r'^$', 'index'),
+ url(r'^(?P<poll_id>\d+)/$', 'detail'),
+ url(r'^(?P<poll_id>\d+)/results/$', 'results'),
+ url(r'^(?P<poll_id>\d+)/vote/$', 'vote'),
)
The idea behind :func:`~django.conf.urls.include` and URLconf
Modified: django/trunk/docs/intro/tutorial04.txt
===================================================================
--- django/trunk/docs/intro/tutorial04.txt 2011-11-06 01:19:40 UTC (rev
17072)
+++ django/trunk/docs/intro/tutorial04.txt 2011-11-06 16:58:04 UTC (rev
17073)
@@ -221,10 +221,10 @@
from django.conf.urls import patterns, include, url
urlpatterns = patterns('polls.views',
- (r'^$', 'index'),
- (r'^(?P<poll_id>\d+)/$', 'detail'),
- (r'^(?P<poll_id>\d+)/results/$', 'results'),
- (r'^(?P<poll_id>\d+)/vote/$', 'vote'),
+ url(r'^$', 'index'),
+ url(r'^(?P<poll_id>\d+)/$', 'detail'),
+ url(r'^(?P<poll_id>\d+)/results/$', 'results'),
+ url(r'^(?P<poll_id>\d+)/vote/$', 'vote'),
)
Change it like so::
@@ -234,12 +234,12 @@
from polls.models import Poll
urlpatterns = patterns('',
- (r'^$',
+ url(r'^$',
ListView.as_view(
queryset=Poll.objects.order_by('-pub_date')[:5],
context_object_name='latest_poll_list',
template_name='polls/index.html')),
- (r'^(?P<pk>\d+)/$',
+ url(r'^(?P<pk>\d+)/$',
DetailView.as_view(
model=Poll,
template_name='polls/detail.html')),
@@ -248,7 +248,7 @@
model=Poll,
template_name='polls/results.html'),
name='poll_results'),
- (r'^(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
+ url(r'^(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
)
We're using two generic views here:
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
