Use Django's bundled six util

authors.py

@@ -4,10 +4,11 @@
 """
 
 import re
-import six
 import subprocess
 from operator import itemgetter
 
+from django.utils import six
+
 re_line = re.compile(six.b(r'(\d+)\s+(\d+)\s+[^<]+$'))
 re_author = re.compile(six.b(r'.+<(.+)>$'))
 

easy_thumbnails/alias.py

@@ -1,4 +1,4 @@
-import six
+from django.utils import six
 
 from easy_thumbnails.conf import settings
 

easy_thumbnails/files.py

@@ -1,5 +1,5 @@
 import os
-import six
+from django.utils import six
 
 from django.core.files.base import File, ContentFile
 from django.core.files.storage import (

easy_thumbnails/processors.py

@@ -1,5 +1,5 @@
 import re
-import six
+from django.utils import six
 
 try:
     from PIL import Image, ImageChops, ImageFilter

easy_thumbnails/templatetags/thumbnail.py

@@ -1,5 +1,5 @@
 import re
-import six
+from django.utils import six
 
 from django.template import (
     Library, Node, VariableDoesNotExist, TemplateSyntaxError)

easy_thumbnails/tests/source_generators.py

@@ -1,5 +1,5 @@
 import base64
-import six
+from django.utils import six
 
 try:
     from cStringIO import cStringIO as BytesIO

easy_thumbnails/utils.py

@@ -2,7 +2,7 @@
 import hashlib
 import inspect
 import math
-import six
+from django.utils import six
 
 from django.utils.functional import LazyObject
 from django.utils import timezone

setup.py

@@ -29,9 +29,8 @@ def read_files(*filenames):
     packages=find_packages(),
     include_package_data=True,
     install_requires=[
-        'django>=1.4',
+        'django>=1.4.2',
         'pillow',
-        'six',
     ],
     classifiers=[
         'Development Status :: 5 - Production/Stable',