django-cms · vinitkumar · Dec 9, 2024 · Nov 29, 2024 · Nov 29, 2024 · Nov 29, 2024
diff --git a/cms/app_registration.py b/cms/app_registration.py
@@ -1,5 +1,5 @@
 import inspect
-from functools import lru_cache
+from functools import cache
 from importlib import import_module
 
 from django.apps import apps
@@ -98,7 +98,7 @@ def autodiscover_cms_configs():
                     "CMSAppExtension")
 
 
-@lru_cache(maxsize=None)
+@cache
 def get_cms_extension_apps():
     """
     Returns django app configs of apps with a cms extension
@@ -110,7 +110,7 @@ def get_cms_extension_apps():
     return cms_apps
 
 
-@lru_cache(maxsize=None)
+@cache
 def get_cms_config_apps():
     """
     Returns django app configs of apps with a cms config

diff --git a/cms/context_processors.py b/cms/context_processors.py
@@ -1,4 +1,4 @@
-from functools import lru_cache
+from functools import cache
 
 from django.utils.functional import lazy
 
@@ -12,7 +12,7 @@ def cms_settings(request):
     """
     from menus.menu_pool import MenuRenderer
 
-    @lru_cache(maxsize=None)
+    @cache
     def _get_menu_renderer():
         # We use lru_cache to avoid getting the manager
         # every time this function is called.

diff --git a/cms/plugin_rendering.py b/cms/plugin_rendering.py
@@ -558,25 +558,24 @@ def _get_cached_placeholder_content(self, placeholder, language):
         return language_cache.get(placeholder.pk)
 
     def _get_content_object(self, page, slots=None):
-        if self.toolbar.get_object() == page:
+        toolbar_obj = self.toolbar.get_object()
+        if isinstance(toolbar_obj, PageContent) and toolbar_obj.page == page:
             # Current object belongs to the page itself
-            page_content = self.toolbar.get_object()
-            placeholders = Placeholder.objects.get_for_obj(page_content)
+            return Placeholder.objects.get_for_obj(toolbar_obj)
         elif slots:
             # If looking for inherited placeholders, slots is specified
             if self.toolbar.preview_mode_active or self.toolbar.edit_mode_active:
                 page_content = (page.pagecontent_set(manager="admin_manager")
                                 .current_content(language=self.request_language).first())
             else:
                 page_content = page.pagecontent_set.filter(language=self.request_language).first()
-            placeholders = Placeholder.objects.get_for_obj(page_content) if page_content else Placeholder.objects.none()
-        else:
-            page_content = page.get_content_obj(self.request_language, fallback=False)
-
+            return Placeholder.objects.get_for_obj(page_content) if page_content else Placeholder.objects.none()
+        elif page_content := page.get_content_obj(self.request_language, fallback=False):
             PageContent.page.field.set_cached_value(page_content, page)
             # Creates any placeholders missing on the page
-            placeholders = page_content.rescan_placeholders().values()
-        return placeholders
+            return page_content.rescan_placeholders().values()
+        else:
+            return Placeholder.objects.none()
 
     def _preload_placeholders_for_page(self, page, slots=None, inherit=False):
         """

diff --git a/cms/tests/test_rendering.py b/cms/tests/test_rendering.py
@@ -295,6 +295,19 @@ def test_details_view(self):
         r = self.strip_rendered(response.content.decode('utf8'))
         self.assertEqual(r, '|' + self.test_data['text_main'] + '|' + self.test_data['text_sub'] + '|')
 
+    def test_getting_placeholders(self):
+        """ContentRenderer._get_content_object uses toolbar to return placeholders of a page"""
+        request = self.get_request(page=self.test_page)
+        request.toolbar = CMSToolbar(request)
+        wrong_content_obj = self.test_page2.get_content_obj("en")
+        wrong_content_obj.page = self.test_page
+        request.toolbar.set_object(wrong_content_obj)
+        content_renderer = self.get_content_renderer(request)
+        placeholders = content_renderer._get_content_object(self.test_page)
+        wrong_content_obj.page = self.test_page2
+
+        self.assertEqual(len(placeholders), 2)
+
     @override_settings(
         CMS_PLUGIN_PROCESSORS=('cms.tests.test_rendering.sample_plugin_processor',),
         CMS_PLUGIN_CONTEXT_PROCESSORS=('cms.tests.test_rendering.sample_plugin_context_processor',),

diff --git a/cms/utils/plugins.py b/cms/utils/plugins.py
@@ -2,7 +2,7 @@
 import sys
 from collections import OrderedDict, defaultdict, deque
 from copy import deepcopy
-from functools import lru_cache
+from functools import cache, lru_cache
 from itertools import starmap
 from operator import itemgetter
 
@@ -20,7 +20,7 @@
 logger = logging.getLogger(__name__)
 
 
-@lru_cache(maxsize=None)
+@cache
 def get_plugin_class(plugin_type: str) -> CMSPluginBase:
     """Returns the plugin class for a given plugin_type (str)"""
     return plugin_pool.get_plugin(plugin_type)

diff --git a/pyproject.toml b/pyproject.toml
@@ -57,9 +57,11 @@ extend-ignore = [
   "PLW0603",
   "PLW0602",
   "PLW2901",
+  "UP006",  # Use `list` instead of `typing.List` for type annotation
   "UP028",
   "UP030",
   "UP031",
+  "UP035",  # UP035 `typing.List` is deprecated, use `list` instead
 ]
 
 [tool.ruff.lint.per-file-ignores]