Fix import error for django 4.0 (#18)

* Fix import error for django 4.0

The smart_text function has been deprecated from django 4.0 and is replaced by smart_text. To work with both django 4.0 and earlier versions, we try to import smart_text, and if that fails, we import smart_str and create an alias function called smart_text.

* move compatilbity imports into compatible.py

Co-authored-by: Johan Thelin <johan@eperoto.com>

Author: e8johan

compressor/cache.py

@@ -10,13 +10,7 @@
 from django.core.files.base import ContentFile
 from django.utils.encoding import smart_bytes
 from django.utils.functional import SimpleLazyObject
-
-try:
-    from django.utils.encoding import force_text
-except ImportError:
-    from django.utils.encoding import force_str
-    force_text = force_str
-
+from compressor.compatible import force_text
 from compressor.conf import settings
 from compressor.storage import default_storage
 from compressor.utils import get_mod_func

compressor/compatible.py

@@ -0,0 +1,11 @@
+try:
+    from django.utils.encoding import smart_text
+except ImportError:
+    from django.utils.encoding import smart_str
+    smart_text = smart_str
+
+try:
+    from django.utils.encoding import force_text
+except ImportError:
+    from django.utils.encoding import force_str
+    force_text = force_str

compressor/filters/base.py

@@ -22,8 +22,7 @@ def shell_quote(s):
 from django.core.files.temp import NamedTemporaryFile
 
 import six
-from django.utils.encoding import smart_text
-
+from compressor.compatible import smart_text
 from compressor.cache import cache, get_precompiler_cachekey
 
 from compressor.conf import settings

compressor/management/commands/compress.py

@@ -12,7 +12,7 @@
 from django.core.management.base import BaseCommand, CommandError
 import django.template
 from django.template import Context
-from django.utils.encoding import smart_text
+from compressor.compatible import smart_text
 from django.template.loader import get_template  # noqa Leave this in to preload template locations
 from django.template import engines
 

compressor/parser/beautifulsoup.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 from django.core.exceptions import ImproperlyConfigured
-from django.utils.encoding import smart_text
+from compressor.compatible import smart_text
 
 from compressor.parser import ParserBase
 

compressor/parser/default_htmlparser.py

@@ -1,7 +1,7 @@
 import sys
 
 import six
-from django.utils.encoding import smart_text
+from compressor.compatible import smart_text
 
 from compressor.exceptions import ParserError
 from compressor.parser import ParserBase

compressor/parser/html5lib.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 from django.core.exceptions import ImproperlyConfigured
-from django.utils.encoding import smart_text
+from compressor.compatible import smart_text
 from django.utils.functional import cached_property
 
 from compressor.exceptions import ParserError

compressor/parser/lxml.py

@@ -2,7 +2,7 @@
 
 import six
 from django.core.exceptions import ImproperlyConfigured
-from django.utils.encoding import smart_text
+from compressor.compatible import smart_text
 from django.utils.functional import cached_property
 
 from compressor.exceptions import ParserError

compressor/tests/test_filters.py

@@ -6,7 +6,8 @@
 import mock
 
 import six
-from django.utils.encoding import smart_text
+from compressor.compatible import smart_text
+
 from django.test import TestCase
 from django.test.utils import override_settings