From 19f98946f2b31b62303aedb5b30951ca295116d8 Mon Sep 17 00:00:00 2001 From: Alasdair Nicol Date: Sun, 6 Sep 2015 12:17:59 +0100 Subject: [PATCH] Fixed #25358 -- Improved variable name for question in tutorial. --- docs/intro/tutorial03.txt | 2 +- docs/intro/tutorial04.txt | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/intro/tutorial03.txt b/docs/intro/tutorial03.txt index 9da44c3caf..ecc80233a5 100644 --- a/docs/intro/tutorial03.txt +++ b/docs/intro/tutorial03.txt @@ -177,7 +177,7 @@ commas, according to publication date: def index(request): latest_question_list = Question.objects.order_by('-pub_date')[:5] - output = ', '.join([p.question_text for p in latest_question_list]) + output = ', '.join([q.question_text for q in latest_question_list]) return HttpResponse(output) # Leave the rest of the views (detail, results, vote) unchanged diff --git a/docs/intro/tutorial04.txt b/docs/intro/tutorial04.txt index 2d09de9579..716ab73a4d 100644 --- a/docs/intro/tutorial04.txt +++ b/docs/intro/tutorial04.txt @@ -76,13 +76,13 @@ create a real version. Add the following to ``polls/views.py``: from .models import Choice, Question # ... def vote(request, question_id): - p = get_object_or_404(Question, pk=question_id) + question = get_object_or_404(Question, pk=question_id) try: - selected_choice = p.choice_set.get(pk=request.POST['choice']) + selected_choice = question.choice_set.get(pk=request.POST['choice']) except (KeyError, Choice.DoesNotExist): # Redisplay the question voting form. return render(request, 'polls/detail.html', { - 'question': p, + 'question': question, 'error_message': "You didn't select a choice.", }) else: @@ -91,7 +91,7 @@ create a real version. Add the following to ``polls/views.py``: # Always return an HttpResponseRedirect after successfully dealing # with POST data. This prevents data from being posted twice if a # user hits the Back button. - return HttpResponseRedirect(reverse('polls:results', args=(p.id,))) + return HttpResponseRedirect(reverse('polls:results', args=(question.id,))) This code includes a few things we haven't covered yet in this tutorial: @@ -135,7 +135,7 @@ This code includes a few things we haven't covered yet in this tutorial: '/polls/3/results/' - where the ``3`` is the value of ``p.id``. This redirected URL will + where the ``3`` is the value of ``question.id``. This redirected URL will then call the ``'results'`` view to display the final page. As mentioned in :doc:`Tutorial 3 `, ``request`` is an