fix: remove unnecessary distutil dependency

Author: fsbraun

djangocms_alias/compat.py

@@ -1,8 +1,7 @@
 import os
-from distutils.util import strtobool
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-ENABLE_VERSIONING = strtobool(os.environ.get("ENABLE_VERSIONING", "1"))
+ENABLE_VERSIONING = os.environ.get("ENABLE_VERSIONING", "1").lower() in ("y", "yes", "t", "true", "on", "1")
 
 EXTRA_INSTALLED_APPS = ["djangocms_versioning"] if ENABLE_VERSIONING else []
 

tests/settings.py

@@ -2,7 +2,7 @@
 from unittest import skipUnless
 from urllib.parse import urlparse
 
-from cms.api import add_plugin, create_title
+from cms.api import add_plugin, create_page_content
 from cms.toolbar.utils import get_object_edit_url
 from cms.utils import get_current_site
 from cms.utils.plugins import downcast_plugins
@@ -37,7 +37,7 @@ def test_extra_plugin_items_for_alias_plugins(self):
         page_content = None
         if is_versioning_enabled():
             # Can only edit page/content that is in DRAFT
-            page_content = create_title(self.language, "Draft Page", self.page, created_by=self.superuser)
+            page_content = create_page_content(self.language, "Draft Page", self.page, created_by=self.superuser)
             placeholder = page_content.get_placeholders().get(slot="content")
 
         alias_plugin = alias.get_content(self.language).populate(

tests/test_cms_plugins.py

@@ -1,8 +1,5 @@
-from distutils.version import LooseVersion
-
-from cms.api import add_plugin, create_title
+from cms.api import add_plugin, create_page_content
 from cms.models import Placeholder
-from django import get_version
 from django.contrib.sites.models import Site
 from django.core.exceptions import ValidationError
 from django.urls import reverse
@@ -14,9 +11,6 @@
 
 from .base import BaseAliasPluginTestCase
 
-DJANGO_VERSION = get_version()
-DJANGO_4_0 = LooseVersion(DJANGO_VERSION) < LooseVersion("4.1")
-
 
 class AliasModelsTestCase(BaseAliasPluginTestCase):
     def _get_aliases_positions(self, category):
@@ -254,10 +248,10 @@ def test_pages_using_alias(self):
         self.add_alias_plugin_to_page(site2_page, alias, "de")
 
         if is_versioning_enabled():
-            create_title("en", "Site2 EN", site2_page, created_by=self.superuser)
+            create_page_content("en", "Site2 EN", site2_page, created_by=self.superuser)
             self._publish(site2_page, "en")
         else:
-            create_title("en", "Site2 EN", site2_page)
+            create_page_content("en", "Site2 EN", site2_page)
 
         self.add_alias_plugin_to_page(site2_page, alias, "en")
         # Should show on the list only once
@@ -401,8 +395,6 @@ def test_delete(self):
         self.assertEqual(Placeholder.objects.count(), 1)
         alias.delete()
         self.assertFalse(alias.__class__.objects.filter(pk=alias.pk).exists())
-        if DJANGO_4_0:
-            self.assertEqual(alias.cms_plugins.count(), 0)
         self.assertEqual(Placeholder.objects.count(), 0)
         alias.save()  # Django 4.1+ disallows to use relations (cmsplugins) of unsaved objects.
         self.assertEqual(alias.cms_plugins.count(), 0)