Remove django.utils.six for recent python version to work with Django 3.0

Author: TheBuky

pipeline/collector.py

@@ -7,7 +7,11 @@
 import django
 from django.contrib.staticfiles import finders
 from django.contrib.staticfiles.storage import staticfiles_storage
-from django.utils import six
+try:
+    from django.utils.six import iterkeys
+except ImportError:
+    iterkeys = iter
+
 
 from pipeline.finders import PipelineFinder
 
@@ -57,7 +61,7 @@ def collect(self, request=None, files=[]):
                 if files and len(files) == len(found_files):
                     break
 
-        return six.iterkeys(found_files)
+        return iterkeys(found_files)
 
     def copy_file(self, path, prefixed_path, source_storage):
         # Delete the target file if needed or break

pipeline/compilers/__init__.py

@@ -9,7 +9,11 @@
 from django.contrib.staticfiles.storage import staticfiles_storage
 from django.core.files.base import ContentFile
 from django.utils.encoding import smart_bytes
-from django.utils.six import string_types, text_type
+try:
+   from django.utils.six import string_types, text_type
+except ImportError:
+    string_types = (str,)
+    text_type = str
 
 from pipeline.conf import settings
 from pipeline.exceptions import CompilerError

pipeline/compressors/__init__.py

@@ -10,7 +10,10 @@
 
 from django.contrib.staticfiles.storage import staticfiles_storage
 from django.utils.encoding import smart_bytes, force_text
-from django.utils.six import string_types
+try:
+    from django.utils.six import string_types
+except ImportError:
+    string_types = (str,)
 
 from pipeline.conf import settings
 from pipeline.exceptions import CompressorError

pipeline/conf.py

@@ -8,7 +8,10 @@
 from django.conf import settings as _settings
 from django.core.signals import setting_changed
 from django.dispatch import receiver
-from django.utils.six import string_types
+try:
+    from django.utils.six import string_types
+except ImportError:
+    string_types = (str,)
 
 
 DEFAULTS = {

setup.py

@@ -27,6 +27,7 @@
         'Framework :: Django :: 1.11',
         'Framework :: Django :: 2.0',
         'Framework :: Django :: 2.2',
+        'Framework :: Django :: 3.0',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
@@ -36,6 +37,7 @@
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Utilities',
         'Topic :: Software Development :: Libraries :: Python Modules',

tox.ini

@@ -14,12 +14,14 @@ basepython =
   py35: python3.5
   py36: python3.6
   py37: python3.7
+  py38: python3.8
 deps =
   py{27,py}: mock
   py{27,py}: futures
   django22: Django>=2.2.1,<3.0
   django111: Django>=1.11,<1.12
-  django20: Django>=2.0,<2.1
+  django20: Django>=2.0,<2.2
+  django30: Django>=3.0
   django-master: https://github.com/django/django/archive/master.tar.gz
   jinja2
   coverage