Added code to the models.py files, to make everything run as smooth in Python 3 as...

diff --git a/essay/models.py b/essay/models.py
index 102e68a9c42d2120bb5a57f8693e8500563e805e..de8dcb189ed4b273f334d6ebe086f7bc031605fe 100644 (file)
--- a/essay/models.py
+++ b/essay/models.py
@@ -1,7 +1,10 @@
+from __future__ import unicode_literals # for Py2 & Py3 compatibility
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext as _
 from quiz.models import Question
 
 
+@python_2_unicode_compatible
 class Essay_Question(Question):
 
     def check_if_correct(self, guess):
@@ -16,8 +19,8 @@ class Essay_Question(Question):
     def answer_choice_to_string(self, guess):
         return str(guess)
 
-    def __unicode__(self):
-        return unicode(self.content)
+    def __str__(self):
+        return self.content
 
     class Meta:
         verbose_name = _("Essay style question")

diff --git a/multichoice/models.py b/multichoice/models.py
index e80359abf3a988de8b12d38f125b8442a848d9de..f7f3d1aa6735b245b3ab7860cb7ace71d82c789f 100644 (file)
--- a/multichoice/models.py
+++ b/multichoice/models.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals # for Py2 & Py3 compatibility
+from django.utils.encoding import python_2_unicode_compatible # ditto
 from django.utils.translation import ugettext as _
 from django.db import models
 from quiz.models import Question
@@ -52,6 +54,7 @@ class MCQuestion(Question):
         verbose_name_plural = _("Multiple Choice Questions")
 
 
+@python_2_unicode_compatible
 class Answer(models.Model):
     question = models.ForeignKey(MCQuestion, verbose_name=_("Question"))
 
@@ -66,9 +69,10 @@ class Answer(models.Model):
                                   help_text=_("Is this a correct answer?"),
                                   verbose_name=_("Correct"))
 
-    def __unicode__(self):
-        return unicode(self.content)
+    def __str__(self):
+        return self.content
 
     class Meta:
         verbose_name = _("Answer")
         verbose_name_plural = _("Answers")
+

diff --git a/quiz/models.py b/quiz/models.py
index 4cbfef3952046f8b60ae8620c2940a6088e04e99..f2a497441b8ce6b079e137a9ba1550c5251d55d3 100644 (file)
--- a/quiz/models.py
+++ b/quiz/models.py
@@ -1,3 +1,4 @@
+from __future__ import unicode_literals # for Py2 & Py3 compatibility
 import re
 import json
 
@@ -6,6 +7,7 @@ from django.core.exceptions import ValidationError
 from django.core.validators import MaxValueValidator
 from django.utils.translation import ugettext as _
 from django.utils.timezone import now
+from django.utils.encoding import python_2_unicode_compatible
 
 from model_utils.managers import InheritanceManager
 
@@ -20,6 +22,7 @@ class CategoryManager(models.Manager):
         return new_category
 
 
+@python_2_unicode_compatible
 class Category(models.Model):
 
     category = models.CharField(
@@ -33,10 +36,12 @@ class Category(models.Model):
         verbose_name = _("Category")
         verbose_name_plural = _("Categories")
 
-    def __unicode__(self):
-        return unicode(self.category)
+    # Changed __unicode__() to __str__() for Py2 & Py3 compatibility
+    def __str__(self):
+        return self.category
 
 
+@python_2_unicode_compatible
 class SubCategory(models.Model):
 
     sub_category = models.CharField(
@@ -52,11 +57,13 @@ class SubCategory(models.Model):
     class Meta:
         verbose_name = _("Sub-Category")
         verbose_name_plural = _("Sub-Categories")
-
-    def __unicode__(self):
-        return unicode(self.sub_category + " (" + self.category.category + ")")
+    
+    # Changed __unicode__() to __str__() for Py2 & Py3 compatibility
+    def __str__(self):
+        return self.sub_category + " (" + self.category.category + ")"
 
 
+@python_2_unicode_compatible
 class Quiz(models.Model):
 
     title = models.CharField(
@@ -138,7 +145,7 @@ class Quiz(models.Model):
             self.exam_paper = True
 
         if self.pass_mark > 100:
-            raise ValidationError(u'%s is above 100' % self.pass_mark)
+            raise ValidationError('%s is above 100' % self.pass_mark)
 
         super(Quiz, self).save(force_insert, force_update, *args, **kwargs)
 
@@ -146,8 +153,9 @@ class Quiz(models.Model):
         verbose_name = _("Quiz")
         verbose_name_plural = _("Quizzes")
 
-    def __unicode__(self):
-        return unicode(self.title)
+    # Changed __unicode__() to __str__() for Py2 & Py3 compatibility
+    def __str__(self):
+        return self.title
 
     def get_questions(self):
         return self.question_set.all().select_subclasses()
@@ -264,11 +272,11 @@ class Progress(models.Model):
             updated_possible = int(match.group('possible')) +\
                 abs(possible_to_add)
 
-            new_score = u",".join(
+            new_score = ",".join(
                 [
-                    unicode(question.category),
-                    unicode(updated_score),
-                    unicode(updated_possible), u""
+                    str(question.category),
+                    str(updated_score),
+                    str(updated_possible), ""
                 ])
 
             # swap old score for the new one
@@ -277,12 +285,12 @@ class Progress(models.Model):
 
         else:
             #  if not present but existing, add with the points passed in
-            self.score += u",".join(
+            self.score += ",".join(
                 [
-                    unicode(question.category),
-                    unicode(score_to_add),
-                    unicode(possible_to_add),
-                    u""
+                    str(question.category),
+                    str(score_to_add),
+                    str(possible_to_add),
+                    ""
                 ])
             self.save()
 
@@ -495,7 +503,7 @@ class Sitting(models.Model):
         if with_answers:
             user_answers = json.loads(self.user_answers)
             for question in questions:
-                question.user_answer = user_answers[unicode(question.id)]
+                question.user_answer = user_answers[str(question.id)]
 
         return questions
 
@@ -518,7 +526,7 @@ class Sitting(models.Model):
         total = self.get_max_score
         return answered, total
 
-
+@python_2_unicode_compatible
 class Question(models.Model):
     """
     Base class for all question types.
@@ -564,5 +572,7 @@ class Question(models.Model):
         verbose_name_plural = _("Questions")
         ordering = ['category']
 
-    def __unicode__(self):
-        return unicode(self.content)
+    # Changed __unicode__() to __str__() for Py2 & Py3 compatibility
+    def __str__(self):
+        return self.content
+

diff --git a/true_false/models.py b/true_false/models.py
index 5b9c531c338b629c3a5ce54a2de05a7946716117..159c973e48fe54c21d609a328de0c76338342c1c 100644 (file)
--- a/true_false/models.py
+++ b/true_false/models.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals # for Py2 & Py3 compatibility
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext as _
 from django.db import models
 from quiz.models import Question