Add Django 4.0 support (#760)

Author: kevinmarsh

pipeline/compressors/__init__.py

@@ -7,7 +7,7 @@
 from itertools import takewhile
 
 from django.contrib.staticfiles.storage import staticfiles_storage
-from django.utils.encoding import smart_bytes, force_text
+from django.utils.encoding import smart_bytes, force_str
 
 from pipeline.conf import settings
 from pipeline.exceptions import CompressorError
@@ -183,7 +183,7 @@ def encoded_content(self, path):
         if path in self.__class__.asset_contents:
             return self.__class__.asset_contents[path]
         data = self.read_bytes(path)
-        self.__class__.asset_contents[path] = force_text(base64.b64encode(data))
+        self.__class__.asset_contents[path] = force_str(base64.b64encode(data))
         return self.__class__.asset_contents[path]
 
     def mime_type(self, path):
@@ -217,7 +217,7 @@ def read_bytes(self, path):
 
     def read_text(self, path):
         content = self.read_bytes(path)
-        return force_text(content)
+        return force_str(content)
 
 
 class CompressorBase(object):
@@ -250,7 +250,7 @@ def execute_command(self, command, content):
             raise CompressorError(stderr)
         elif self.verbose:
             print(stderr)
-        return force_text(stdout)
+        return force_str(stdout)
 
 
 class NoopCompressor(CompressorBase):

tests/tests/test_middleware.py

@@ -8,6 +8,10 @@
 from pipeline.middleware import MinifyHTMLMiddleware
 
 
+def dummy_get_response(request):
+    return None
+
+
 class MiddlewareTest(TestCase):
     whitespace = b'    '
 
@@ -25,19 +29,17 @@ def setUp(self):
     def test_middleware_html(self):
         self.resp['Content-Type'] = 'text/html; charset=UTF-8'
 
-        response = MinifyHTMLMiddleware().process_response(self.req, self.resp)
+        response = MinifyHTMLMiddleware(dummy_get_response).process_response(self.req, self.resp)
         self.assertIn('text/html', response['Content-Type'])
         self.assertNotIn(self.whitespace, response.content)
 
     def test_middleware_text(self):
         self.resp['Content-Type'] = 'text/plain; charset=UTF-8'
 
-        response = MinifyHTMLMiddleware().process_response(self.req, self.resp)
+        response = MinifyHTMLMiddleware(dummy_get_response).process_response(self.req, self.resp)
         self.assertIn('text/plain', response['Content-Type'])
         self.assertIn(self.whitespace, response.content)
 
     @patch('pipeline.middleware.settings.PIPELINE_ENABLED', False)
     def test_middleware_not_used(self):
-        self.resp['Content-Type'] = 'text/plain; charset=UTF-8'
-
-        self.assertRaises(MiddlewareNotUsed, MinifyHTMLMiddleware)
+        self.assertRaises(MiddlewareNotUsed, MinifyHTMLMiddleware, dummy_get_response)

tests/urls.py

@@ -1,10 +1,10 @@
-from django.conf.urls import url
 from django.contrib import admin
+from django.urls import path
 from django.views.generic import TemplateView
 
 
 urlpatterns = [
-    url(r'^$', TemplateView.as_view(template_name="index.html"), name="index"),
-    url(r'^empty/$', TemplateView.as_view(template_name="empty.html"), name="empty"),
-    url(r'^admin/', admin.site.urls),
+    path('', TemplateView.as_view(template_name='index.html'), name='index'),
+    path('empty/', TemplateView.as_view(template_name='empty.html'), name='empty'),
+    path('admin/', admin.site.urls),
 ]

tox.ini

@@ -56,10 +56,8 @@ commands =
     {envbindir}/coverage xml
 whitelist_externals = npm
 ignore_outcome =
-    dj40: True
     djmain: True
 ignore_errors =
-    dj40: True
     djmain: True
 
 [testenv:docs]