Repport the 'add_metaclas' decorator form django.utils.six to handle metaclass overwriting (fix mistakes)

Author: TheBuky

pipeline/decorator.py

@@ -7,18 +7,6 @@
     handle MetaClass overwright working on both versions (or dropping python 2 support).
 """
 
-def with_metaclass(meta, *bases):
-    """Create a base class with a metaclass."""
-    # This requires a bit of explanation: the basic idea is to make a dummy
-    # metaclass for one level of class instantiation that replaces itself with
-    # the actual metaclass.
-    class metaclass(meta):
-
-        def __new__(cls, name, this_bases, d):
-            return meta(name, bases, d)
-    return type.__new__(metaclass, 'temporary_class', (), {})
-
-
 def add_metaclass(metaclass):
     """Class decorator for creating a class with a metaclass."""
     def wrapper(cls):

pipeline/forms.py

@@ -5,14 +5,14 @@
 from django.contrib.staticfiles.storage import staticfiles_storage
 from django.utils.functional import cached_property
 try:
-    from django.utils.six import iteritems
+    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
-from .decorator import add_metaclass
 from .packager import Packager
 
 

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(),