Merge pull request #725 from vmsp/fix-714

Add Django 3.1 compatibility

Author: Buky

pipeline/storage.py

@@ -2,7 +2,13 @@
 
 from io import BytesIO
 
-from django.contrib.staticfiles.storage import CachedStaticFilesStorage, ManifestStaticFilesStorage, StaticFilesStorage
+import django
+
+_CACHED_STATIC_FILES_STORAGE_AVAILABLE = django.VERSION[0] <= 3 and django.VERSION[1] < 1
+
+if _CACHED_STATIC_FILES_STORAGE_AVAILABLE:
+    from django.contrib.staticfiles.storage import CachedStaticFilesStorage
+from django.contrib.staticfiles.storage import ManifestStaticFilesStorage, StaticFilesStorage
 from django.contrib.staticfiles.utils import matches_patterns
 
 from django.core.files.base import File
@@ -90,14 +96,17 @@ class NonPackagingPipelineStorage(NonPackagingMixin, PipelineStorage):
     pass
 
 
-class PipelineCachedStorage(PipelineMixin, CachedStaticFilesStorage):
-    # Deprecated since Django 2.2
-    pass
+if _CACHED_STATIC_FILES_STORAGE_AVAILABLE:
+    class PipelineCachedStorage(PipelineMixin, CachedStaticFilesStorage):
+        # Deprecated since Django 2.2
+        # Removed in Django 3.1
+        pass
 
 
-class NonPackagingPipelineCachedStorage(NonPackagingMixin, PipelineCachedStorage):
-    # Deprecated since Django 2.2
-    pass
+    class NonPackagingPipelineCachedStorage(NonPackagingMixin, PipelineCachedStorage):
+        # Deprecated since Django 2.2
+        # Removed in Django 3.1
+        pass
 
 
 class PipelineManifestStorage(PipelineMixin, ManifestStaticFilesStorage):

pipeline/templatetags/pipeline.py

@@ -4,7 +4,8 @@
 from django.contrib.staticfiles.storage import staticfiles_storage
 
 from django import template
-from django.template.base import Context, VariableDoesNotExist
+from django.template.context import Context
+from django.template.base import VariableDoesNotExist
 from django.template.loader import render_to_string
 from django.utils.safestring import mark_safe