Drop six back out, we get it with Django

diff --git a/multichoice/tests.py b/multichoice/tests.py
index 899d3d8e474ef410dbdf8bad79a626adda864e96..1b66d2621ef7cddf7c8ad2af3d5c394812a19454 100644 (file)
--- 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 0947c040469582414e61e693c40332af2fc58dbd..9f3bd38e8201126e8e7efbc6c4ae1fba5dda23ce 100644 (file)
--- 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 224b85619e67460b6139712d8990f5bebf8ca396..3ed175760d699cb520d0f4163fb1519c2747abdf 100644 (file)
--- 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 40e313a8cdf5cd53a8e1bafa9866b41db31a50ed..ecb959130967a72201d51206a857c50ceaddc618 100644 (file)
--- 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'
 )