From: Dougal Matthews <dougal@redhat.com>
Date: Tue, 25 Nov 2014 15:34:28 +0000 (+0000)
Subject: Add six, the Python 2 and 3 comabitability utility
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6ed06c169da6b009a7ca419a05b2f3b960c239d0;p=django_quiz.git

Add six, the Python 2 and 3 comabitability utility
---

diff --git a/multichoice/tests.py b/multichoice/tests.py
index 0442a47..899d3d8 100644
--- a/multichoice/tests.py
+++ b/multichoice/tests.py
@@ -1,8 +1,7 @@
-from StringIO import StringIO
-
 from django.db.models.fields.files import ImageFieldFile
 from django.core.files.base import ContentFile
 from django.test import TestCase
+from six import StringIO
 
 from .models import MCQuestion, Answer
 
diff --git a/quiz/tests.py b/quiz/tests.py
index 09d68b5..0947c04 100644
--- a/quiz/tests.py
+++ b/quiz/tests.py
@@ -1,5 +1,4 @@
 # -*- coding: iso-8859-15 -*-
-from StringIO import StringIO
 
 from django.conf import settings
 from django.contrib.auth.models import User, Permission
@@ -10,6 +9,7 @@ from django.http import HttpRequest
 from django.test import TestCase
 from django.template import Template, Context
 from django.utils.importlib import import_module
+from six import StringIO
 
 from .models import Category, Quiz, Progress, Sitting, SubCategory
 from .views import (anon_session_score, QuizListView, CategoriesListView,
diff --git a/requirements.txt b/requirements.txt
index 3ed1757..224b856 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,7 @@
 django-model-utils==2.0.3
 Django==1.6.5
 Pillow==2.5.0
+six==1.8.0
 
 # Only needed for running tests.
 tox
diff --git a/setup.py b/setup.py
index ecb9591..40e313a 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,8 @@ setup(
     install_requires=[
         'django-model-utils == 2.0.3',
         'Django >= 1.5.1',
-        'Pillow == 2.5.0'
+        'Pillow == 2.5.0',
+        'six==1.8.0'
     ],
     test_suite='runtests.runtests'
 )