diff --git a/cms/admin/placeholderadmin.py b/cms/admin/placeholderadmin.py index 5ab0f6e73b8..3c6a8a36e9a 100644 --- a/cms/admin/placeholderadmin.py +++ b/cms/admin/placeholderadmin.py @@ -36,7 +36,7 @@ from cms.signals import post_placeholder_operation, pre_placeholder_operation from cms.toolbar.utils import get_plugin_tree_as_json from cms.utils import get_current_site -from cms.utils.compat.warnings import RemovedInDjangoCMS50Warning +from cms.utils.compat.warnings import RemovedInDjangoCMS60Warning from cms.utils.conf import get_cms_setting from cms.utils.i18n import get_language_code, get_language_list from cms.utils.plugins import ( @@ -180,7 +180,7 @@ def __new__(cls, name, bases, attrs): return super_new(cls, name, bases, attrs) warnings.warn( "PlaceholderAdminMixin is no longer needed and thus will be removed in django CMS 5.0", - RemovedInDjangoCMS50Warning, + RemovedInDjangoCMS60Warning, stacklevel=2, ) return super_new(cls, name, bases, attrs) diff --git a/cms/api.py b/cms/api.py index 642fe93925d..430d9507674 100644 --- a/cms/api.py +++ b/cms/api.py @@ -60,7 +60,7 @@ def my_function(): from cms.plugin_base import CMSPluginBase from cms.plugin_pool import plugin_pool from cms.utils import get_current_site -from cms.utils.compat.warnings import RemovedInDjangoCMS43Warning +from cms.utils.compat.warnings import RemovedInDjangoCMS50Warning from cms.utils.conf import get_cms_setting from cms.utils.i18n import get_language_list from cms.utils.page import get_available_slug, get_clean_username @@ -363,7 +363,7 @@ def create_title(language, title, page, menu_title=None, slug=None, """ warnings.warn( "cms.api.create_title has been renamed to cms.api.create_page_content().", - RemovedInDjangoCMS43Warning, + RemovedInDjangoCMS50Warning, stacklevel=2 ) return create_page_content( diff --git a/cms/cms_plugins.py b/cms/cms_plugins.py index a6cd078c50b..01806a2360f 100644 --- a/cms/cms_plugins.py +++ b/cms/cms_plugins.py @@ -14,7 +14,7 @@ from cms.models.placeholderpluginmodel import PlaceholderReference from cms.plugin_base import CMSPluginBase, PluginMenuItem from cms.plugin_pool import plugin_pool -from cms.utils.compat.warnings import RemovedInDjangoCMS42Warning +from cms.utils.compat.warnings import RemovedInDjangoCMS50Warning from cms.utils.urlutils import admin_reverse @@ -117,7 +117,7 @@ def create_alias(self, request): 'AliasPlugin is deprecated, ' 'and it will be removed; ' 'please use the package djangocms-alias instead', - RemovedInDjangoCMS42Warning + RemovedInDjangoCMS50Warning ) if not request.user.is_staff: return HttpResponseForbidden("not enough privileges") diff --git a/cms/cms_toolbars.py b/cms/cms_toolbars.py index 040215dfc98..4e8762ae555 100644 --- a/cms/cms_toolbars.py +++ b/cms/cms_toolbars.py @@ -22,7 +22,7 @@ from cms.toolbar_pool import toolbar_pool from cms.utils import get_language_from_request, page_permissions from cms.utils.compat import DJANGO_4_2 -from cms.utils.compat.warnings import RemovedInDjangoCMS43Warning +from cms.utils.compat.warnings import RemovedInDjangoCMS50Warning from cms.utils.conf import get_cms_setting from cms.utils.i18n import get_language_dict, get_language_tuple from cms.utils.page_permissions import ( @@ -439,7 +439,7 @@ def title(self): warnings.warn( "Title property of PageToolbar will be removed. Use page_content property instead.", - RemovedInDjangoCMS43Warning, stacklevel=2) + RemovedInDjangoCMS50Warning, stacklevel=2) return self.page_content @title.setter @@ -448,7 +448,7 @@ def title(self, page_content): warnings.warn( "Title property of PageToolbar will be removed. Use page_content property instead.", - RemovedInDjangoCMS43Warning, stacklevel=2) + RemovedInDjangoCMS50Warning, stacklevel=2) self.page_content = page_content # Populate diff --git a/cms/extensions/toolbar.py b/cms/extensions/toolbar.py index 3c3f919be97..ea48a44d718 100644 --- a/cms/extensions/toolbar.py +++ b/cms/extensions/toolbar.py @@ -5,7 +5,7 @@ from cms.models import PageContent from cms.toolbar_base import CMSToolbar from cms.utils import get_language_list -from cms.utils.compat.warnings import RemovedInDjangoCMS43Warning +from cms.utils.compat.warnings import RemovedInDjangoCMS50Warning from cms.utils.page_permissions import user_can_change_page from cms.utils.urlutils import admin_reverse @@ -86,7 +86,7 @@ def get_title_extension_admin(self, language=None): """ warnings.warn( "get_title_extension_admin has been deprecated and replaced by get_page_content_extension_admin", - RemovedInDjangoCMS43Warning, + RemovedInDjangoCMS50Warning, stacklevel=2, ) urls = [] diff --git a/cms/forms/fields.py b/cms/forms/fields.py index b8490422c27..720aad95b25 100644 --- a/cms/forms/fields.py +++ b/cms/forms/fields.py @@ -11,13 +11,13 @@ from cms.forms.widgets import PageSelectWidget, PageSmartLinkWidget from cms.models.pagemodel import Page from cms.utils.compat import DJANGO_4_2 -from cms.utils.compat.warnings import RemovedInDjangoCMS42Warning +from cms.utils.compat.warnings import RemovedInDjangoCMS50Warning class SuperLazyIterator: def __init__(self, func): warnings.warn("SuperLazyIterator is deprecated.", - RemovedInDjangoCMS42Warning, stacklevel=2) + RemovedInDjangoCMS50Warning, stacklevel=2) self.func = func def __iter__(self): @@ -28,7 +28,7 @@ class LazyChoiceField(forms.ChoiceField): def __init__(self, *args, **kwargs): warnings.warn("LazyChoiceField is deprecated. Use Django's ChoiceField instead.", - RemovedInDjangoCMS42Warning, stacklevel=2) + RemovedInDjangoCMS50Warning, stacklevel=2) super().__init__(*args, **kwargs) @property diff --git a/cms/forms/wizards.py b/cms/forms/wizards.py index 261959db485..162141a4d1f 100644 --- a/cms/forms/wizards.py +++ b/cms/forms/wizards.py @@ -9,7 +9,7 @@ from cms.admin.forms import AddPageForm, SlugWidget as AdminSlugWidget from cms.plugin_pool import plugin_pool from cms.utils import permissions -from cms.utils.compat.warnings import RemovedInDjangoCMS42Warning +from cms.utils.compat.warnings import RemovedInDjangoCMS50Warning from cms.utils.conf import get_cms_setting from cms.utils.page import get_available_slug from cms.utils.page_permissions import user_can_add_page, user_can_add_subpage @@ -27,7 +27,7 @@ class SlugWidget(AdminSlugWidget): SlugWidget has moved to cms.admin.forms""" def __init__(self, *args, **kwargs): warnings.warn("Import SlugWidget from cms.admin.forms. SlugWidget will be removed from cms.forms.wizards", - RemovedInDjangoCMS42Warning, stacklevel=2) + RemovedInDjangoCMS50Warning, stacklevel=2) super().__init__(*args, **kwargs) diff --git a/cms/models/pagemodel.py b/cms/models/pagemodel.py index 54371ee9f0d..22e719d2bc4 100644 --- a/cms/models/pagemodel.py +++ b/cms/models/pagemodel.py @@ -19,7 +19,7 @@ from cms.exceptions import LanguageError from cms.models.managers import PageManager, PageNodeManager, PageUrlManager from cms.utils import i18n -from cms.utils.compat.warnings import RemovedInDjangoCMS43Warning +from cms.utils.compat.warnings import RemovedInDjangoCMS50Warning from cms.utils.conf import get_cms_setting from cms.utils.i18n import get_current_language from cms.utils.page import get_clean_username @@ -737,7 +737,7 @@ def set_translations_cache(self): warnings.warn( "Method `set_translations_cache` is deprecated. Use `get_content_obj` instead. " "For admin views use `set_admin_content_cache` instead.", - RemovedInDjangoCMS43Warning, + RemovedInDjangoCMS50Warning, stacklevel=2, ) for translation in self.pagecontent_set.all(): diff --git a/cms/models/permissionmodels.py b/cms/models/permissionmodels.py index 7dc5ca5608a..fd95189c438 100644 --- a/cms/models/permissionmodels.py +++ b/cms/models/permissionmodels.py @@ -283,9 +283,9 @@ def get_page_permission_tuple(self): def get_page_ids(self): import warnings - from cms.utils.compat.warnings import RemovedInDjangoCMS43Warning + from cms.utils.compat.warnings import RemovedInDjangoCMS50Warning warnings.warn("get_page_ids is deprecated and will be removed in django CMS 4.3, " - "use get_page_permission_tuple instead", RemovedInDjangoCMS43Warning, stacklevel=2) + "use get_page_permission_tuple instead", RemovedInDjangoCMS50Warning, stacklevel=2) return self._get_page_ids() diff --git a/cms/templatetags/cms_alias_tags.py b/cms/templatetags/cms_alias_tags.py index e8573f4547b..0dc19a0f7f3 100644 --- a/cms/templatetags/cms_alias_tags.py +++ b/cms/templatetags/cms_alias_tags.py @@ -4,7 +4,7 @@ from django.utils.safestring import mark_safe from cms.toolbar.utils import get_toolbar_from_request -from cms.utils.compat.warnings import RemovedInDjangoCMS43Warning +from cms.utils.compat.warnings import RemovedInDjangoCMS50Warning from cms.utils.plugins import downcast_plugins, get_plugins_as_layered_tree register = template.Library() @@ -16,7 +16,7 @@ def render_alias_plugin(context, instance): 'AliasPlugin is deprecated, ' 'and it will be removed; ' 'please use the package djangocms-alias instead', - RemovedInDjangoCMS43Warning + RemovedInDjangoCMS50Warning ) request = context['request'] diff --git a/cms/test_utils/testcases.py b/cms/test_utils/testcases.py index 3623c8e5770..4500e42de7a 100644 --- a/cms/test_utils/testcases.py +++ b/cms/test_utils/testcases.py @@ -157,11 +157,11 @@ def add_page_permission(self, user, page, **kwargs): def get_page_title_obj(self, page, language="en"): import warnings - from cms.utils.compat.warnings import RemovedInDjangoCMS42Warning + from cms.utils.compat.warnings import RemovedInDjangoCMS50Warning warnings.warn( "get_page_title_obj is deprecated, use get_pagecontent_obj instead", - RemovedInDjangoCMS42Warning, + RemovedInDjangoCMS50Warning, stacklevel=2, ) return PageContent.objects.get(page=page, language=language) diff --git a/cms/tests/test_extensions.py b/cms/tests/test_extensions.py index 22ff8bdd279..7aeed2361e3 100644 --- a/cms/tests/test_extensions.py +++ b/cms/tests/test_extensions.py @@ -16,7 +16,7 @@ ) from cms.test_utils.testcases import CMSTestCase from cms.toolbar_pool import toolbar_pool -from cms.utils.compat.warnings import RemovedInDjangoCMS43Warning +from cms.utils.compat.warnings import RemovedInDjangoCMS50Warning from cms.utils.urlutils import admin_reverse @@ -437,7 +437,7 @@ def populate(self): message = "get_title_extension_admin has been deprecated and replaced by get_page_content_extension_admin" with self.login_user_context(self.admin): self.assertWarns( - RemovedInDjangoCMS43Warning, + RemovedInDjangoCMS50Warning, message, lambda: self.client.get(self.page.get_absolute_url()), ) diff --git a/cms/utils/compat/warnings.py b/cms/utils/compat/warnings.py index e9ec6cfb835..8c5d5dccaf2 100644 --- a/cms/utils/compat/warnings.py +++ b/cms/utils/compat/warnings.py @@ -1,8 +1,5 @@ -class RemovedInDjangoCMS42Warning(DeprecationWarning): - pass - -class RemovedInDjangoCMS43Warning(DeprecationWarning): +class RemovedInDjangoCMS50Warning(DeprecationWarning): pass -class RemovedInDjangoCMS50Warning(DeprecationWarning): +class RemovedInDjangoCMS60Warning(DeprecationWarning): pass diff --git a/cms/utils/page_permissions.py b/cms/utils/page_permissions.py index 2d5475c6caa..762c4c1150a 100644 --- a/cms/utils/page_permissions.py +++ b/cms/utils/page_permissions.py @@ -5,7 +5,7 @@ from cms.models import Page, PermissionTuple from cms.utils import get_current_site from cms.utils.compat.dj import available_attrs -from cms.utils.compat.warnings import RemovedInDjangoCMS43Warning +from cms.utils.compat.warnings import RemovedInDjangoCMS50Warning from cms.utils.conf import get_cms_setting from cms.utils.permissions import ( cached_func, @@ -360,7 +360,7 @@ def _perm_tuples_to_ids(perm_tuples): fn_name = "_".join(inspect.stack()[1][3].split("_")[:-1]) # Calling function's name warnings.warn(f"{fn_name}_ids is deprecated. Use {fn_name}_perm_tuples instead.", - RemovedInDjangoCMS43Warning, stacklevel=3) + RemovedInDjangoCMS50Warning, stacklevel=3) allowed_pages = Q() for perm in perm_tuples: diff --git a/cms/utils/permissions.py b/cms/utils/permissions.py index 04c17a73d43..9d0b975428c 100644 --- a/cms/utils/permissions.py +++ b/cms/utils/permissions.py @@ -202,12 +202,12 @@ def has_global_permission(user, site, action, use_cache=True): def has_page_permission(user, page, action, use_cache=True): import warnings - from cms.utils.compat.warnings import RemovedInDjangoCMS43Warning + from cms.utils.compat.warnings import RemovedInDjangoCMS50Warning from cms.utils.page_permissions import has_generic_permission warnings.warn("has_page_permission is deprecated and will be removed in django CMS 4.3. " "Use cms.utils.page_permissions.has_generic_permission instead.", - RemovedInDjangoCMS43Warning, stacklevel=2) + RemovedInDjangoCMS50Warning, stacklevel=2) action_map = { "change": "change_page", @@ -334,10 +334,10 @@ def get_view_restrictions(pages): Load all view restrictions for the pages """ - from cms.utils.compat.warnings import RemovedInDjangoCMS43Warning + from cms.utils.compat.warnings import RemovedInDjangoCMS50Warning warnings.warn("get_view_restrictions will be removed in django CMS 4.3", - RemovedInDjangoCMS43Warning, stacklevel=2) + RemovedInDjangoCMS50Warning, stacklevel=2) restricted_pages = defaultdict(list) diff --git a/cms/wizards/wizard_pool.py b/cms/wizards/wizard_pool.py index f79e1299e10..298517f104c 100644 --- a/cms/wizards/wizard_pool.py +++ b/cms/wizards/wizard_pool.py @@ -1,7 +1,7 @@ from django.apps import apps from django.utils.translation import gettext as _ -from cms.utils.compat.warnings import RemovedInDjangoCMS50Warning +from cms.utils.compat.warnings import RemovedInDjangoCMS60Warning from cms.wizards.wizard_base import Wizard, entry_choices, get_entries, get_entry # noqa: F401 @@ -43,7 +43,7 @@ def register(self, entry): warnings.warn( "Using wizard_pool is deprecated. Use the cms_config instead.", - RemovedInDjangoCMS50Warning, + RemovedInDjangoCMS60Warning, stacklevel=2, ) assert isinstance(entry, Wizard), "entry must be an instance of Wizard"