Fix tests under Python 3

diff --git a/.travis.yml b/.travis.yml
index 0a9f9a24e276b0bf0f83c01f18623ac9e9a3b78f..e32930cdbac34565d1e9bac0a9cad054920d4087 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,3 @@ install:
 - pip install tox
 script:
 - tox -e $TOX_ENV
-matrix:
-  fast_finish: true
-  allow_failures:
-  - env: TOX_ENV=py33
-  - env: TOX_ENV=py34

diff --git a/quiz/tests.py b/quiz/tests.py
index 9f3bd38e8201126e8e7efbc6c4ae1fba5dda23ce..50caa80b210bf64beb38e2c60a445191dbdc5260 100644 (file)
--- a/quiz/tests.py
+++ b/quiz/tests.py
@@ -135,7 +135,7 @@ class TestProgress(TestCase):
 
         category_dict = self.p1.list_all_cat_scores
 
-        self.assertIn(str(category_dict.keys()[0]), self.p1.score)
+        self.assertIn(str(list(category_dict.keys())[0]), self.p1.score)
 
         self.assertIn(self.c1.category, self.p1.score)
 

diff --git a/quiz/views.py b/quiz/views.py
index aac3d71dd6180dc321d98e31b9b91751433347a3..5e6819c199e03d2570960b77c8c3914bb21b3948 100644 (file)
--- a/quiz/views.py
+++ b/quiz/views.py
@@ -265,8 +265,8 @@ class QuizTake(FormView):
         if self.quiz.random_order is True:
             random.shuffle(question_list)
 
-        if all([self.quiz.max_questions,
-               self.quiz.max_questions < len(question_list)]):
+        if self.quiz.max_questions and (self.quiz.max_questions
+                                        < len(question_list)):
             question_list = question_list[:self.quiz.max_questions]
 
         # session score for anon users