Skip to content

Commit f9ccdc0

Browse files
fsbraunfsbraun
authored
Merge pull request #7946 from django-cms/dependabot/github_actions/amannn/action-semantic-pull-request-5.5.3
build(deps): bump amannn/action-semantic-pull-request from 5.5.2 to 5.5.3
2 parents 538ae59 + 3350ea2 commit f9ccdc0

File tree

6 files changed

+22
-22
lines changed

6 files changed

+22
-22
lines changed

‎.github/workflows/lint-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ jobs:
1515
name: Validate PR title
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: amannn/action-semantic-pull-request@v5.5.2
18+
- uses: amannn/action-semantic-pull-request@v5.5.3
1919
env:
2020
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/linters.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- run: python -Im pip install --user ruff
1717

1818
- name: Run ruff on cms
19-
run: ruff --output-format=github cms
19+
run: ruff check --output-format=github cms
2020

2121
- name: Run ruff on menus
22-
run: ruff --output-format=github menus
22+
run: ruff check --output-format=github menus

‎cms/forms/utils.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ def get_page_choices_for_site(site, language):
4747

4848
for page in pages:
4949
translations = page.filtered_translations
50-
titles_by_language = {trans.language: trans.title for trans in translations}
50+
pagecontent_by_language = {trans.language: trans.title for trans in translations}
5151

52-
for language in languages:
52+
for lang in languages:
5353
# EmptyPageContent is used to prevent the cms from trying
5454
# to find a translation in the database
55-
if language in titles_by_language:
56-
title = titles_by_language[language]
55+
if lang in pagecontent_by_language:
56+
title = pagecontent_by_language[lang]
5757
indent = "  " * (page.node.depth - 1)
5858
label = mark_safe(f"{indent}{escape(title)}")
5959
yield (page.pk, label)

‎cms/models/pagemodel.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -657,8 +657,8 @@ def clear_cache(self, language=None, menu=False, placeholder=False):
657657

658658
placeholders = self.get_placeholders(language)
659659

660-
for placeholder in placeholders:
661-
placeholder.clear_cache(language, site_id=self.node.site_id)
660+
for placeholder_instance in placeholders:
661+
placeholder_instance.clear_cache(language, site_id=self.node.site_id)
662662

663663
if menu:
664664
# Clears all menu caches for this page's site

‎cms/plugin_pool.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,24 +56,24 @@ def validate_templates(self, plugin=None):
5656
plugins = [plugin]
5757
else:
5858
plugins = self.plugins.values()
59-
for plugin in plugins:
60-
if (plugin.render_plugin and not type(plugin.render_plugin) == property
61-
or hasattr(plugin.model, 'render_template')
62-
or hasattr(plugin, 'get_render_template')):
63-
if (plugin.render_template is None and not hasattr(plugin, 'get_render_template')):
59+
for plugin_class in plugins:
60+
if (plugin_class.render_plugin and type(plugin_class.render_plugin) is not property
61+
or hasattr(plugin_class.model, 'render_template')
62+
or hasattr(plugin_class, 'get_render_template')):
63+
if (plugin_class.render_template is None and not hasattr(plugin_class, 'get_render_template')):
6464
raise ImproperlyConfigured(
6565
"CMS Plugins must define a render template, "
6666
"a get_render_template method or "
67-
"set render_plugin=False: %s" % plugin
67+
"set render_plugin=False: %s" % plugin_class
6868
)
6969
# If plugin class defines get_render_template we cannot
7070
# statically check for valid template file as it depends
7171
# on plugin configuration and context.
7272
# We cannot prevent developer to shoot in the users' feet
73-
elif not hasattr(plugin, 'get_render_template'):
73+
elif not hasattr(plugin_class, 'get_render_template'):
7474
from django.template import loader
7575

76-
template = plugin.render_template
76+
template = plugin_class.render_template
7777
if isinstance(template, str) and template:
7878
try:
7979
loader.get_template(template)
@@ -85,17 +85,17 @@ def validate_templates(self, plugin=None):
8585
if str(e) == template:
8686
raise ImproperlyConfigured(
8787
"CMS Plugins must define a render template (%s) that exists: %s"
88-
% (plugin, template)
88+
% (plugin_class, template)
8989
)
9090
else:
9191
pass
9292
except TemplateSyntaxError:
9393
pass
9494
else:
95-
if plugin.allow_children:
95+
if plugin_class.allow_children:
9696
raise ImproperlyConfigured(
9797
"CMS Plugins can not define render_plugin=False and allow_children=True: %s"
98-
% plugin
98+
% plugin_class
9999
)
100100

101101
def register_plugin(self, plugin):

‎cms/toolbar/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ def collect_plugin_data(plugin):
101101

102102
tree_data.append(plugin_info)
103103

104-
for plugin in plugin.child_plugin_instances:
105-
collect_plugin_data(plugin)
104+
for plugin_instance in plugin.child_plugin_instances:
105+
collect_plugin_data(plugin_instance)
106106

107107
with force_language(toolbar.toolbar_language):
108108
for root_plugin in root_plugins:

0 commit comments

Comments
 (0)