fix: Mitigate performance hit due to deprecation warnings for v4.1 (#…

…7587)

* Dynamic unihan decoder selection based on page language

* Update test

* fix: mitigate performance hit due to deprecation warnings

cms/appresolver.py

@@ -12,7 +12,7 @@
 from cms.models.pagemodel import Page
 from cms.utils import get_current_site
 from cms.utils.i18n import get_language_list
-from cms.utils.moderator import use_draft
+from cms.utils.moderator import _use_draft
 
 APP_RESOLVERS = []
 
@@ -35,7 +35,7 @@ def applications_page_check(request, path=None):
         if path.startswith(lang + "/"):
             path = path[len(lang + "/"):]
 
-    use_public = not use_draft(request)
+    use_public = not _use_draft(request)
 
     for resolver in APP_RESOLVERS:
         try:

cms/templatetags/cms_tags.py

@@ -30,7 +30,7 @@
 from cms.plugin_pool import plugin_pool
 from cms.toolbar.utils import get_toolbar_from_request
 from cms.utils import get_current_site, get_language_from_request, get_site_id
-from cms.utils.moderator import use_draft
+from cms.utils.moderator import _use_draft
 from cms.utils.page import get_page_queryset
 from cms.utils.placeholder import validate_placeholder_name
 from cms.utils.urlutils import admin_reverse
@@ -69,7 +69,7 @@ def _get_page_by_untyped_arg(page_lookup, request, site_id):
     try:
         if 'pk' in page_lookup:
             page = Page.objects.select_related('node').get(**page_lookup)
-            if request and use_draft(request):
+            if request and _use_draft(request):
                 if page.publisher_is_draft:
                     return page
                 else:
@@ -80,7 +80,7 @@ def _get_page_by_untyped_arg(page_lookup, request, site_id):
                 else:
                     return page
         else:
-            pages = get_page_queryset(site, draft=use_draft(request))
+            pages = get_page_queryset(site, draft=_use_draft(request))
             return pages.select_related('node').get(**page_lookup)
     except Page.DoesNotExist:
         subject = _('Page not found on %(domain)s') % {'domain': site.domain}

cms/utils/moderator.py

@@ -5,6 +5,9 @@
 def use_draft(request):
     warnings.warn(f"{inspect.stack()[0][3]} is deprecated and will be removed in django CMS 4.1",
                   DeprecationWarning, stacklevel=2)
+    return _use_draft(request)
+
+def _use_draft(request):
     is_staff = (request.user.is_authenticated and request.user.is_staff)
     return is_staff and not request.session.get('cms_preview')
 
@@ -15,7 +18,7 @@ def get_model_queryset(model, request=None):
     """
     warnings.warn(f"{inspect.stack()[0][3]} is deprecated and will be removed in django CMS 4.1",
                   DeprecationWarning, stacklevel=2)
-    if request and use_draft(request):
+    if request and _use_draft(request):
         return model.objects.drafts()
     return model.objects.public()
 

cms/utils/page.py

@@ -9,7 +9,7 @@
 from cms.constants import PAGE_USERNAME_MAX_LENGTH
 from cms.utils import get_current_site
 from cms.utils.conf import get_cms_setting
-from cms.utils.moderator import use_draft
+from cms.utils.moderator import _use_draft
 
 SUFFIX_REGEX = re.compile(r'^(.*)-(\d+)$')
 
@@ -169,7 +169,7 @@ def get_page_from_request(request, use_path=None, clean_path=None):
     if clean_path is None:
         clean_path = not bool(use_path)
 
-    draft = use_draft(request)
+    draft = _use_draft(request)
     preview = 'preview' in request.GET
     path = request.path_info if use_path is None else use_path
 

cms/utils/plugins.py

@@ -45,8 +45,7 @@ def assign_plugins(request, placeholders, template=None, lang=None, is_fallback=
         return
     placeholders = tuple(placeholders)
     lang = lang or get_language_from_request(request)
-    qs = get_cmsplugin_queryset(request)
-    qs = qs.filter(placeholder__in=placeholders, language=lang)
+    qs = CMSPlugin.objects.filter(placeholder__in=placeholders, language=lang)
     plugins = list(qs.order_by('placeholder', 'path'))
     fallbacks = defaultdict(list)
     # If no plugin is present in the current placeholder we loop in the fallback languages

menus/menu_pool.py

@@ -14,7 +14,7 @@
 from cms.utils import get_current_site
 from cms.utils.conf import get_cms_setting
 from cms.utils.i18n import get_default_language_for_site, is_language_prefix_patterns_used
-from cms.utils.moderator import use_draft
+from cms.utils.moderator import _use_draft as use_draft
 from menus.base import Menu
 from menus.exceptions import NamespaceAlreadyRegistered
 from menus.models import CacheKey