fix: remove more older django version compat

Author: asfaltboy

pipeline/conf.py

@@ -6,11 +6,7 @@
 import shlex
 
 from django.conf import settings as _settings
-try:
-    from django.core.signals import setting_changed
-except ImportError:
-    # Django < 1.8
-    from django.test.signals import setting_changed
+from django.core.signals import setting_changed
 from django.dispatch import receiver
 from django.utils.six import string_types
 

tests/tests/test_storage.py

@@ -6,11 +6,7 @@
 from django.test import TestCase
 from django.test.utils import override_settings
 
-try:
-    from django.test.utils import modify_settings
-except ImportError:
-    # Django < 1.7
-    from tests.utils import modify_settings
+from django.test.utils import modify_settings
 
 from pipeline.collector import default_collector
 from pipeline.storage import PipelineStorage

tests/utils.py

@@ -1,14 +1,8 @@
 import os
 
 import django
-from django.conf import settings
-from django.utils import six
 
-try:
-    from django.test import override_settings
-except ImportError:
-    # Django < 1.7
-    from django.test.utils import override_settings
+from django.test import override_settings
 
 
 def _(path):
@@ -24,51 +18,3 @@ def __init__(self, **kwargs):
             # so we must do the same.
             super(pipeline_settings, self).__init__()
         self.options = {'PIPELINE': kwargs}
-
-
-# Django < 1.7 (copy-pasted from Django 1.7)
-class modify_settings(override_settings):
-    """
-    Like override_settings, but makes it possible to append, prepend or remove
-    items instead of redefining the entire list.
-    """
-    def __init__(self, *args, **kwargs):
-        if args:
-            # Hack used when instantiating from SimpleTestCase._pre_setup.
-            assert not kwargs
-            self.operations = args[0]
-        else:
-            assert not args
-            self.operations = list(kwargs.items())
-
-    def save_options(self, test_func):
-        if test_func._modified_settings is None:
-            test_func._modified_settings = self.operations
-        else:
-            # Duplicate list to prevent subclasses from altering their parent.
-            test_func._modified_settings = list(
-                test_func._modified_settings) + self.operations
-
-    def enable(self):
-        self.options = {}
-        for name, operations in self.operations:
-            try:
-                # When called from SimpleTestCase._pre_setup, values may be
-                # overridden several times; cumulate changes.
-                value = self.options[name]
-            except KeyError:
-                value = list(getattr(settings, name, []))
-            for action, items in operations.items():
-                # items my be a single value or an iterable.
-                if isinstance(items, six.string_types):
-                    items = [items]
-                if action == 'append':
-                    value = value + [item for item in items if item not in value]
-                elif action == 'prepend':
-                    value = [item for item in items if item not in value] + value
-                elif action == 'remove':
-                    value = [item for item in value if item not in items]
-                else:
-                    raise ValueError("Unsupported action: %s" % action)
-            self.options[name] = value
-        super(modify_settings, self).enable()