From: Dougal Matthews <dougal@redhat.com>
Date: Tue, 25 Nov 2014 15:42:24 +0000 (+0000)
Subject: Drop six back out, we get it with Django
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=48affcf8a199ca41c79eaee07c39d1933f21ac47;p=django_quiz.git

Drop six back out, we get it with Django
---

diff --git a/multichoice/tests.py b/multichoice/tests.py
index 899d3d8..1b66d26 100644
--- a/multichoice/tests.py
+++ b/multichoice/tests.py
@@ -1,7 +1,7 @@
-from django.db.models.fields.files import ImageFieldFile
 from django.core.files.base import ContentFile
+from django.db.models.fields.files import ImageFieldFile
 from django.test import TestCase
-from six import StringIO
+from django.utils.six import StringIO
 
 from .models import MCQuestion, Answer
 
diff --git a/quiz/tests.py b/quiz/tests.py
index 0947c04..9f3bd38 100644
--- a/quiz/tests.py
+++ b/quiz/tests.py
@@ -6,10 +6,10 @@ from django.core.exceptions import ValidationError
 from django.core.files.base import ContentFile
 from django.core.urlresolvers import resolve
 from django.http import HttpRequest
-from django.test import TestCase
 from django.template import Template, Context
+from django.test import TestCase
 from django.utils.importlib import import_module
-from six import StringIO
+from django.utils.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 224b856..3ed1757 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,6 @@
 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 40e313a..ecb9591 100644
--- a/setup.py
+++ b/setup.py
@@ -29,8 +29,7 @@ setup(
     install_requires=[
         'django-model-utils == 2.0.3',
         'Django >= 1.5.1',
-        'Pillow == 2.5.0',
-        'six==1.8.0'
+        'Pillow == 2.5.0'
     ],
     test_suite='runtests.runtests'
 )