Merge pull request jazzband#708 from TheBuky/django3-six

Remove django.utils.six to work with Django 3.0

Author: Buky

.travis.yml

@@ -18,19 +18,25 @@ matrix:
     - env: TOXENV=py36-django22
       python: "3.6"
     - env: TOXENV=py37-django22
-      python: "3.7-dev"
-    - env: TOXENV=py35-django-master
-      python: "3.5"
+      python: "3.7"
+    - env: TOXENV=py36-django30
+      python: "3.6"
+    - env: TOXENV=py37-django30
+      python: "3.7"
+    - env: TOXENV=py38-django30
+      python: "3.8"
     - env: TOXENV=py36-django-master
       python: "3.6"
     - env: TOXENV=py37-django-master
-      python: "3.7-dev"
+      python: "3.7"
+    - env: TOXENV=py38-django-master
+      python: "3.8-dev"
     - env: TOXENV=docs
       python: "2.7"
   allow_failures:
-    - env: TOXENV=py35-django-master
     - env: TOXENV=py36-django-master
     - env: TOXENV=py37-django-master
+    - env: TOXENV=py38-django-master
 before_install:
   - nvm install node
   - nvm use node

AUTHORS

@@ -27,6 +27,7 @@ or just made Pipeline more awesome.
  * Brawaga <[email protected]>
  * Brian Montgomery <[email protected]>
  * Bryan Chow <[email protected]>
+ * Buky <[email protected]>
  * Caio Ariede <[email protected]>
  * Camilo Nova <[email protected]>
  * Carl Meyer <[email protected]>

CONTRIBUTING.rst

@@ -33,7 +33,7 @@ tox and django installed::
 Since we use a number of node.js tools, one should first install the node
 depencies. We reccomend using [nvm](https://github.com/nvm-sh/nvm#installation-and-update) , tl;dr::
 
-    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.34.0/install.sh | bash
+    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.2/install.sh | bash
     nvm install node
     nvm use node
 

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 = {

pipeline/decorator.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+""" 
+    This code is a part of django.utils.six on https://github.com/django/django/blob/stable/2.2.x/django/utils/six.py removed form Django 3.0
+    To keep the backward compatibility between python 2 and 3 the decorator need to be used as well, during the time we find a proper way to 
+    handle MetaClass overwright working on both versions (or dropping python 2 support).
+"""
+
+def add_metaclass(metaclass):
+    """Class decorator for creating a class with a metaclass."""
+    def wrapper(cls):
+        orig_vars = cls.__dict__.copy()
+        slots = orig_vars.get('__slots__')
+        if slots is not None:
+            if isinstance(slots, str):
+                slots = [slots]
+            for slots_var in slots:
+                orig_vars.pop(slots_var)
+        orig_vars.pop('__dict__', None)
+        orig_vars.pop('__weakref__', None)
+        return metaclass(cls.__name__, cls.__bases__, orig_vars)
+    return wrapper

pipeline/forms.py

@@ -3,8 +3,13 @@
 from __future__ import unicode_literals
 
 from django.contrib.staticfiles.storage import staticfiles_storage
-from django.utils import six
 from django.utils.functional import cached_property
+try:
+    from django.utils.six import iteritems, add_metaclass
+except ImportError:
+    from .decorator import add_metaclass
+    def iteritems(dictionary):
+        return dictionary.items()
 
 from .collector import default_collector
 from .conf import settings
@@ -168,7 +173,7 @@ def _get_css_files(cls, extra_files):
                                   media_type='css',
                                   extra_files=extra_files.get(media_target,
                                                               [])))
-            for media_target, media_packages in six.iteritems(css_packages)
+            for media_target, media_packages in iteritems(css_packages)
         )
 
     def _get_js_files(cls, extra_files):
@@ -233,7 +238,7 @@ def _get_media_files(cls, packager, media_packages, media_type,
         return source_files
 
 
-@six.add_metaclass(PipelineFormMediaMetaClass)
+@add_metaclass(PipelineFormMediaMetaClass)
 class PipelineFormMedia(object):
     """Base class for form or widget Media classes that use Pipeline packages.
 

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name='django-pipeline',
-    version='1.6.14',
+    version='1.7.0',
     description='Pipeline is an asset packaging library for Django.',
     long_description=io.open('README.rst', encoding='utf-8').read() + '\n\n' +
         io.open('HISTORY.rst', encoding='utf-8').read(),
@@ -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',