From: tomwalker Date: Tue, 12 Aug 2014 11:57:07 +0000 (+0100) Subject: mostly pep8 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=56e9d71195ec21036e85febf8e9b83afc0dea39d;p=django_quiz.git mostly pep8 --- diff --git a/quiz/models.py b/quiz/models.py index 64a5f64..6b5f0e1 100644 --- a/quiz/models.py +++ b/quiz/models.py @@ -482,7 +482,9 @@ class Sitting(models.Model): @property def questions_with_user_answers(self): - return {q : q.user_answer for q in self.get_questions(with_answers=True)} + return { + q: q.user_answer for q in self.get_questions(with_answers=True) + } @property def get_max_score(self): diff --git a/quiz/tests.py b/quiz/tests.py index 90c6b69..7f45a62 100644 --- a/quiz/tests.py +++ b/quiz/tests.py @@ -276,6 +276,9 @@ class TestSitting(TestCase): self.assertIn('123', self.sitting.user_answers) def test_return_questions_with_answers(self): + ''' + Also tests sitting.get_questions(with_answers=True) + ''' self.sitting.add_user_answer(self.question1, '123') self.sitting.add_user_answer(self.question2, '456') diff --git a/quiz/views.py b/quiz/views.py index e5f3152..d8a1bbd 100644 --- a/quiz/views.py +++ b/quiz/views.py @@ -113,9 +113,11 @@ class QuizMarkingDetail(QuizMarkerMixin, DetailView): def get_context_data(self, **kwargs): context = super(QuizMarkingDetail, self).get_context_data(**kwargs) - context['questions'] = context['sitting'].get_questions(with_answers=True) + context['questions'] =\ + context['sitting'].get_questions(with_answers=True) return context + class QuizTake(FormView): form_class = QuestionForm template_name = 'question.html' @@ -215,7 +217,8 @@ class QuizTake(FormView): self.sitting.mark_quiz_complete() if self.quiz.answers_at_end: - results['questions'] = self.sitting.get_questions(with_answers=True) + results['questions'] =\ + self.sitting.get_questions(with_answers=True) results['incorrect_questions'] =\ self.sitting.get_incorrect_questions