8000 fix: lint menus app by vinitkumar · Pull Request #7534 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

fix: lint menus app #7534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 21, 2023
Merged

fix: lint menus app #7534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b733143
feat: add support for testing menus with ruff as well
Apr 21, 2023
0a37130
fix: autofix issues with ruff
Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/linters.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,6 @@ jobs:
python -m pip install --upgrade pip
pip install ruff
- name: Run Ruff
run: ruff cms
run: |
ruff cms
ruff menus
10 changes: 4 additions & 6 deletions menus/menu_pool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,13 @@
from django.urls import NoReverseMatch
from django.utils.functional import cached_property
from django.utils.module_loading import autodiscover_modules
from django.utils.translation import get_language_from_request, gettext_lazy as _
from django.utils.translation import get_language_from_request
from django.utils.translation import gettext_lazy as _

from cms.utils import get_current_site
from cms.utils.i18n import (
get_default_language_for_site,
is_language_prefix_patterns_used
)
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 menus.base import Menu
from menus.exceptions import NamespaceAlreadyRegistered
from menus.models import CacheKey
Expand Down
13 changes: 5 additions & 8 deletions menus/templatetags/menu_tags.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
from urllib.parse import unquote

from classytags.arguments import Argument, IntegerArgument, StringArgument
from classytags.core import Options
from classytags.helpers import InclusionTag
from django import template
from django.contrib.sites.models import Site
from django.urls import reverse, NoReverseMatch
from django.urls import NoReverseMatch, reverse
from django.utils.encoding import force_str
from django.utils.translation import get_language, gettext

from classytags.arguments import IntegerArgument, Argument, StringArgument
from classytags.core import Options
from classytags.helpers import InclusionTag

from cms.utils.i18n import (
force_language,
get_language_list,
get_language_object,
get_public_languages,
)

from menus.menu_pool import menu_pool
from menus.utils import DefaultLanguageChanger


register = template.Library()


Expand Down Expand Up @@ -379,7 +376,7 @@ def get_context(self, context, template, i18n_mode):
i18n_mode = _tmp
if template is NOT_PROVIDED:
template = "menu/language_chooser.html"
if not i18n_mode in MARKERS:
if i18n_mode not in MARKERS:
i18n_mode = 'raw'
if 'request' not in context:
# If there's an exception (500), default context_processors may not be called.
Expand Down
2 changes: 1 addition & 1 deletion menus/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from django.conf import settings
from django.urls import NoReverseMatch, reverse, resolve, Resolver404
from django.urls import NoReverseMatch, Resolver404, resolve, reverse

from cms.utils import get_current_site, get_language_from_request
from cms.utils.i18n import (
Expand Down
0