From a71ce1cdd6ed519b8e600d2b7cacf5f5814538cf Mon Sep 17 00:00:00 2001 From: Kalle Westerling Date: Wed, 17 Jun 2020 22:57:51 -0400 Subject: [PATCH 1/4] removing references to unsupported python_2_unicode_compatible --- essay/models.py | 2 -- multichoice/models.py | 2 -- quiz/models.py | 5 ----- true_false/models.py | 1 - 4 files changed, 10 deletions(-) diff --git a/essay/models.py b/essay/models.py index f4cca85e..151ba803 100644 --- a/essay/models.py +++ b/essay/models.py @@ -1,10 +1,8 @@ from __future__ import unicode_literals -from django.utils.encoding import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ from quiz.models import Question -@python_2_unicode_compatible class Essay_Question(Question): def check_if_correct(self, guess): diff --git a/multichoice/models.py b/multichoice/models.py index 1a89fbbd..8e2507f0 100644 --- a/multichoice/models.py +++ b/multichoice/models.py @@ -1,5 +1,4 @@ from __future__ import unicode_literals -from django.utils.encoding import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ from django.db import models from quiz.models import Question @@ -54,7 +53,6 @@ class Meta: verbose_name_plural = _("Multiple Choice Questions") -@python_2_unicode_compatible class Answer(models.Model): question = models.ForeignKey(MCQuestion, verbose_name=_("Question"), on_delete=models.CASCADE) diff --git a/quiz/models.py b/quiz/models.py index 457acbae..4acfb096 100644 --- a/quiz/models.py +++ b/quiz/models.py @@ -9,7 +9,6 @@ ) from django.utils.translation import ugettext_lazy as _ from django.utils.timezone import now -from django.utils.encoding import python_2_unicode_compatible from django.conf import settings from model_utils.managers import InheritanceManager @@ -25,7 +24,6 @@ def new_category(self, category): return new_category -@python_2_unicode_compatible class Category(models.Model): category = models.CharField( @@ -43,7 +41,6 @@ def __str__(self): return self.category -@python_2_unicode_compatible class SubCategory(models.Model): sub_category = models.CharField( @@ -64,7 +61,6 @@ def __str__(self): return self.sub_category + " (" + self.category.category + ")" -@python_2_unicode_compatible class Quiz(models.Model): title = models.CharField( @@ -541,7 +537,6 @@ def progress(self): return answered, total -@python_2_unicode_compatible class Question(models.Model): """ Base class for all question types. diff --git a/true_false/models.py b/true_false/models.py index 61baf906..a6356271 100644 --- a/true_false/models.py +++ b/true_false/models.py @@ -1,5 +1,4 @@ from __future__ import unicode_literals -from django.utils.encoding import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ from django.db import models from quiz.models import Question From 2cd0fecb473c578eab20a31fb3707582ebc2a627 Mon Sep 17 00:00:00 2001 From: Kalle Westerling Date: Wed, 17 Jun 2020 23:04:58 -0400 Subject: [PATCH 2/4] changed ugettext_lazy to gettext_lazy --- essay/models.py | 2 +- multichoice/models.py | 2 +- quiz/admin.py | 2 +- quiz/models.py | 2 +- quiz/tests.py | 4 ++-- true_false/models.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/essay/models.py b/essay/models.py index 151ba803..c4b0e724 100644 --- a/essay/models.py +++ b/essay/models.py @@ -1,5 +1,5 @@ from __future__ import unicode_literals -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from quiz.models import Question diff --git a/multichoice/models.py b/multichoice/models.py index 8e2507f0..ed300498 100644 --- a/multichoice/models.py +++ b/multichoice/models.py @@ -1,5 +1,5 @@ from __future__ import unicode_literals -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.db import models from quiz.models import Question diff --git a/quiz/admin.py b/quiz/admin.py index a4915ed3..641908fb 100644 --- a/quiz/admin.py +++ b/quiz/admin.py @@ -1,7 +1,7 @@ from django import forms from django.contrib import admin from django.contrib.admin.widgets import FilteredSelectMultiple -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from .models import Quiz, Category, SubCategory, Progress, Question from multichoice.models import MCQuestion, Answer diff --git a/quiz/models.py b/quiz/models.py index 4acfb096..aac03b6f 100644 --- a/quiz/models.py +++ b/quiz/models.py @@ -7,7 +7,7 @@ from django.core.validators import ( MaxValueValidator, validate_comma_separated_integer_list, ) -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.utils.timezone import now from django.conf import settings diff --git a/quiz/tests.py b/quiz/tests.py index e1db0db5..4d1c50ba 100644 --- a/quiz/tests.py +++ b/quiz/tests.py @@ -13,7 +13,7 @@ from django.template import Template, Context from django.test import TestCase from django.utils.six import StringIO -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from .models import Category, Quiz, Progress, Sitting, SubCategory from .views import (anon_session_score, QuizListView, CategoriesListView, @@ -57,7 +57,7 @@ def setUp(self): self.quiz4 = Quiz.objects.create(id=4, title='test quiz 4', description='d4', - url='T-!£$%^&*Q4') + url='T-!�$%^&*Q4') self.question1 = MCQuestion.objects.create(id=1, content='squawk') diff --git a/true_false/models.py b/true_false/models.py index a6356271..434bf837 100644 --- a/true_false/models.py +++ b/true_false/models.py @@ -1,5 +1,5 @@ from __future__ import unicode_literals -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.db import models from quiz.models import Question From 81a86ae21a0381ef24107779b005cc177128bbe5 Mon Sep 17 00:00:00 2001 From: Kalle Westerling Date: Wed, 17 Jun 2020 23:13:38 -0400 Subject: [PATCH 3/4] updated to path (from url) --- quiz/urls.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/quiz/urls.py b/quiz/urls.py index e2ba91fd..b5f5808d 100644 --- a/quiz/urls.py +++ b/quiz/urls.py @@ -1,7 +1,4 @@ -try: - from django.conf.urls import url -except ImportError: - from django.urls import re_path as url +from django.urls import path from .views import QuizListView, CategoriesListView, \ ViewQuizListByCategory, QuizUserProgressView, QuizMarkingList, \ @@ -9,36 +6,36 @@ urlpatterns = [ - url(r'^$', + path('', view=QuizListView.as_view(), name='quiz_index'), - url(r'^category/$', + path('category/', view=CategoriesListView.as_view(), name='quiz_category_list_all'), - url(r'^category/(?P[\w|\W-]+)/$', + path('category/', view=ViewQuizListByCategory.as_view(), name='quiz_category_list_matching'), - url(r'^progress/$', + path('progress/', view=QuizUserProgressView.as_view(), name='quiz_progress'), - url(r'^marking/$', + path('marking/', view=QuizMarkingList.as_view(), name='quiz_marking'), - url(r'^marking/(?P[\d.]+)/$', + path('marking//', view=QuizMarkingDetail.as_view(), name='quiz_marking_detail'), # passes variable 'quiz_name' to quiz_take view - url(r'^(?P[\w-]+)/$', + path('/', view=QuizDetailView.as_view(), name='quiz_start_page'), - url(r'^(?P[\w-]+)/take/$', + path('/take/', view=QuizTake.as_view(), name='quiz_question'), ] From c42e26a8607ce0418ad7fcc51b42e129b5889e0f Mon Sep 17 00:00:00 2001 From: Kalle Westerling Date: Wed, 17 Jun 2020 23:16:16 -0400 Subject: [PATCH 4/4] Removing dependency on six in Django package as per release notes for v3.0 --- multichoice/tests.py | 2 +- quiz/tests.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/multichoice/tests.py b/multichoice/tests.py index 1b66d262..b5ed3fe4 100644 --- a/multichoice/tests.py +++ b/multichoice/tests.py @@ -1,7 +1,7 @@ from django.core.files.base import ContentFile from django.db.models.fields.files import ImageFieldFile from django.test import TestCase -from django.utils.six import StringIO +from six import StringIO from .models import MCQuestion, Answer diff --git a/quiz/tests.py b/quiz/tests.py index 4d1c50ba..a6f8ad6b 100644 --- a/quiz/tests.py +++ b/quiz/tests.py @@ -12,7 +12,7 @@ from django.http import HttpRequest from django.template import Template, Context from django.test import TestCase -from django.utils.six import StringIO +from six import StringIO from django.utils.translation import gettext_lazy as _ from .models import Category, Quiz, Progress, Sitting, SubCategory