Removed backwards compatible shims from 3.5

Author: czpython

cms/cms_toolbars.py

@@ -308,7 +308,7 @@ def page_is_pending(self, page, language):
                 page.publisher_public.get_publisher_state(language) == PUBLISHER_STATE_PENDING)
 
     def in_apphook(self):
-        with force_language(self.toolbar.language):
+        with force_language(self.toolbar.request_language):
             try:
                 resolver = resolve(self.toolbar.request_path)
             except Resolver404:
@@ -447,7 +447,7 @@ def add_draft_live_item(self, template='cms/toolbar/items/live_draft.html', extr
         self.toolbar.add_item(TemplateItem(template, extra_context=context, side=self.toolbar.RIGHT), position=pos)
 
     def add_page_settings_button(self, extra_classes=('cms-btn-action',)):
-        url = '%s?language=%s' % (admin_reverse('cms_page_change', args=[self.page.pk]), self.toolbar.language)
+        url = '%s?language=%s' % (admin_reverse('cms_page_change', args=[self.page.pk]), self.toolbar.request_language)
         self.toolbar.add_modal_button(_('Page settings'), url, side=self.toolbar.RIGHT, extra_classes=extra_classes)
 
     # Menus
@@ -529,7 +529,7 @@ def change_admin_menu(self):
         if not self._changed_admin_menu and can_change_page:
             admin_menu = self.toolbar.get_or_create_menu(ADMIN_MENU_IDENTIFIER)
             url = admin_reverse('cms_page_changelist')  # cms page admin
-            params = {'language': self.toolbar.language}
+            params = {'language': self.toolbar.request_language}
             if self.page:
                 params['page_id'] = self.page.pk
             url = add_url_parameters(url, params)
@@ -600,7 +600,7 @@ def add_page_menu(self):
             )
 
             for title, params, has_perm in add_page_menu_modal_items:
-                params.update(language=self.toolbar.language)
+                params.update(language=self.toolbar.request_language)
                 add_page_menu.add_modal_item(
                     title,
                     url=add_url_parameters(add_page_url, params),
@@ -609,7 +609,7 @@ def add_page_menu(self):
 
             add_page_menu.add_modal_item(
                 _('Duplicate this Page'),
-                url=add_url_parameters(duplicate_page_url, {'language': self.toolbar.language}),
+                url=add_url_parameters(duplicate_page_url, {'language': self.toolbar.request_language}),
                 disabled=not can_add_sibling_page,
             )
 
@@ -621,13 +621,13 @@ def add_page_menu(self):
             current_page_menu.add_link_item(_('Edit this Page'), disabled=edit_mode, url=page_edit_url)
 
             # page settings
-            page_settings_url = add_url_parameters(page_settings_url, language=self.toolbar.language)
+            page_settings_url = add_url_parameters(page_settings_url, language=self.toolbar.request_language)
             settings_disabled = not edit_mode or not can_change
             current_page_menu.add_modal_item(_('Page settings'), url=page_settings_url, disabled=settings_disabled,
                                              on_close=refresh)
 
             # advanced settings
-            advanced_url = add_url_parameters(advanced_url, language=self.toolbar.language)
+            advanced_url = add_url_parameters(advanced_url, language=self.toolbar.request_language)
             can_change_advanced = self.page.has_advanced_settings_permission(self.request.user)
             advanced_disabled = not edit_mode or not can_change_advanced
             current_page_menu.add_modal_item(_('Advanced settings'), url=advanced_url, disabled=advanced_disabled)
@@ -656,7 +656,7 @@ def add_page_menu(self):
             # page type
             if not self.page.is_page_type:
                 page_type_url = admin_reverse('cms_pagetype_add')
-                page_type_url = add_url_parameters(page_type_url, source=self.page.pk, language=self.toolbar.language)
+                page_type_url = add_url_parameters(page_type_url, source=self.page.pk, language=self.toolbar.request_language)
                 page_type_disabled = not edit_mode or not can_add_root_page
                 current_page_menu.add_modal_item(_('Save as Page Type'), page_type_url, disabled=page_type_disabled)
 

cms/models/pagemodel.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 import copy
-import warnings
 from collections import OrderedDict
 from logging import getLogger
 from os.path import join
@@ -180,55 +179,6 @@ def _clear_internal_cache(self):
         if hasattr(self, '_prefetched_objects_cache'):
             del self._prefetched_objects_cache
 
-    @property
-    def parent(self):
-        warnings.warn(
-            'Pages no longer have a "parent" field. '
-            'To get the parent object of any given page, use the "parent_page" attribute. '
-            'This backwards compatible shim will be removed in version 3.6',
-            UserWarning,
-            stacklevel=2,
-        )
-        return self.parent_page
-
-    @property
-    def parent_id(self):
-        warnings.warn(
-            'Pages no longer have a "parent_id" attribute. '
-            'To get the parent id of any given page, '
-            'call "pk" on the "parent_page" attribute. '
-            'This backwards compatible shim will be removed in version 3.6',
-            UserWarning,
-            stacklevel=2,
-        )
-        if self.parent_page:
-            return self.parent_page.pk
-        return None
-
-    @property
-    def site(self):
-        warnings.warn(
-            'Pages no longer have a "site" field. '
-            'To get the site object of any given page, '
-            'call "site" on the page "node" object. '
-            'This backwards compatible shim will be removed in version 3.6',
-            UserWarning,
-            stacklevel=2,
-        )
-        return self.node.site
-
-    @property
-    def site_id(self):
-        warnings.warn(
-            'Pages no longer have a "site_id" attribute. '
-            'To get the site id of any given page, '
-            'call "site_id" on the page "node" object. '
-            'This backwards compatible shim will be removed in version 3.6',
-            UserWarning,
-            stacklevel=2,
-        )
-        return self.node.site_id
-
     @cached_property
     def parent_page(self):
         return self.get_parent_page()

cms/toolbar/toolbar.py

@@ -2,7 +2,6 @@
 from collections import OrderedDict
 import functools
 import operator
-import warnings
 
 from cms import __version__
 from cms.api import get_page_draft
@@ -36,16 +35,6 @@ class BaseToolbar(ToolbarAPIMixin):
     structure_mode_url_on = get_cms_setting('CMS_TOOLBAR_URL__BUILD')
     disable_url = get_cms_setting('CMS_TOOLBAR_URL__DISABLE')
 
-    @property
-    def language(self):
-        # Backwards compatibility
-        warnings.warn(
-            "toolbar.language has been deprecated "
-            "and will be removed in django CMS 3.6",
-            PendingDeprecationWarning
-        )
-        return self.request_language
-
     @cached_property
     def site_language(self):
         cms_page = get_page_draft(self.request.current_page)
@@ -211,16 +200,6 @@ def init_toolbar(self, request, request_path=None):
                 self.toolbars[key].request = self.request
         self.request_path = request_path or request.path
 
-    @property
-    def edit_mode(self):
-        # Backwards compatibility
-        warnings.warn(
-            "toolbar.edit_mode has been deprecated "
-            "and will be removed in django CMS 3.6",
-            PendingDeprecationWarning
-        )
-        return self.edit_mode_active
-
     @cached_property
     def user_settings(self):
         return self.get_user_settings()