Skip to content

Commit 68d534d

Browse files
fsbraunfsbraun
committed
Fix linting
1 parent 5f8bd34 commit 68d534d

File tree

19 files changed

+62
-141
lines changed

19 files changed

+62
-141
lines changed

‎djangocms_frontend/apps.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from django import apps
2-
from django.core.checks import Warning, register
2+
from django.core import checks
33

44

55
class DjangocmsFrontendConfig(apps.AppConfig):
@@ -9,7 +9,7 @@ class DjangocmsFrontendConfig(apps.AppConfig):
99
def ready(self):
1010
from . import plugin_tag
1111

12-
register(check_settings)
12+
checks.register(check_settings)
1313
plugin_tag.setup()
1414

1515

@@ -19,7 +19,7 @@ def check_settings(*args, **kwargs):
1919
warnings = []
2020

2121
if hasattr(settings, "DJANGOCMS_FRONTEND_MINIMUM_INPUT_LENGTH"): # pragma: no cover
22-
warnings.append(Warning(
22+
warnings.append(checks.Warning(
2323
"The DJANGOCMS_FRONTEND_MINIMUM_INPUT_LENGTH setting was removed in djangocms-frontend 2.\n"
2424
"Use DJANGOCMS_LINK_MINIMUM_INPUT_LENGTH instead.",
2525
"This message disappears after removing the DJANGOCMS_FRONTEND_MINIMUM_INPUT_LENGTH from your project's "
@@ -28,7 +28,7 @@ def check_settings(*args, **kwargs):
2828
obj="settings.DJANGOCMS_FRONTEND_MINIMUM_INPUT_LENGTH",
2929
))
3030
if hasattr(settings, "DJANGOCMS_FRONTEND_LINK_MODELS"): # pragma: no cover
31-
warnings.append(Warning(
31+
warnings.append(checks.Warning(
3232
"The DJANGOCMS_FRONTEND_LINK_MODELS setting was removed in djangocms-frontend 2.\n"
3333
"djangocms-frontend 2 uses linkable models from djangocms-link. See "
3434
"https://github.com/django-cms/djangocms-link#django-cms-link for more info.",

‎djangocms_frontend/contrib/alert/forms.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
from django import forms
22
from django.utils.translation import gettext_lazy as _
3+
34
from entangled.forms import EntangledModelForm
45

56
from djangocms_frontend import settings
67
from djangocms_frontend.common import ResponsiveFormMixin, SpacingFormMixin
78
from djangocms_frontend.contrib import alert
8-
from djangocms_frontend.fields import (
9-
AttributesFormField,
10-
ColoredButtonGroup,
11-
TagTypeFormField,
12-
)
9+
from djangocms_frontend.fields import AttributesFormField, ColoredButtonGroup, TagTypeFormField
1310
from djangocms_frontend.helpers import first_choice
1411
from djangocms_frontend.models import FrontendUIItem
1512
from djangocms_frontend.settings import COLOR_STYLE_CHOICES
1613

14+
1715
mixin_factory = settings.get_forms(alert)
1816

1917

‎djangocms_frontend/contrib/badge/forms.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
from django import forms
22
from django.utils.translation import gettext_lazy as _
3+
34
from entangled.forms import EntangledModelForm
45

5-
from djangocms_frontend.fields import (
6-
AttributesFormField,
7-
ColoredButtonGroup,
8-
TagTypeFormField,
9-
)
6+
from djangocms_frontend.fields import AttributesFormField, ColoredButtonGroup, TagTypeFormField
107
from djangocms_frontend.helpers import first_choice
118
from djangocms_frontend.models import FrontendUIItem
129
from djangocms_frontend.settings import COLOR_STYLE_CHOICES

‎djangocms_frontend/contrib/card/cms_plugins.py‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
1-
from cms.plugin_pool import plugin_pool
21
from django.utils.translation import gettext_lazy as _
32

3+
from cms.plugin_pool import plugin_pool
4+
45
from ... import settings
56
from ...cms_plugins import CMSUIPlugin
6-
from ...common import (
7-
AttributesMixin,
8-
BackgroundMixin,
9-
MarginMixin,
10-
PaddingMixin,
11-
ResponsiveMixin,
12-
)
7+
from ...common import AttributesMixin, BackgroundMixin, MarginMixin, PaddingMixin, ResponsiveMixin
138
from ...helpers import add_plugin
149
from .. import card
1510
from . import forms, models
1611

12+
1713
mixin_factory = settings.get_renderer(card)
1814

1915

‎djangocms_frontend/contrib/card/forms.py‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,20 @@
22

33
from django import forms
44
from django.utils.translation import gettext_lazy as _
5+
56
from entangled.forms import EntangledModelForm
67

78
from djangocms_frontend.settings import COLOR_STYLE_CHOICES, DEVICE_SIZES
89

910
from ... import settings
10-
from ...common import (
11-
BackgroundFormMixin,
12-
MarginFormMixin,
13-
PaddingFormMixin,
14-
ResponsiveFormMixin,
15-
)
16-
from ...fields import (
17-
AttributesFormField,
18-
ButtonGroup,
19-
ColoredButtonGroup,
20-
IconGroup,
21-
TagTypeFormField,
22-
)
11+
from ...common import BackgroundFormMixin, MarginFormMixin, PaddingFormMixin, ResponsiveFormMixin
12+
from ...fields import AttributesFormField, ButtonGroup, ColoredButtonGroup, IconGroup, TagTypeFormField
2313
from ...helpers import first_choice, link_to_framework_doc
2414
from ...models import FrontendUIItem
2515
from .. import card
2616
from ..grid.constants import GRID_SIZE
27-
from .constants import (
28-
CARD_ALIGNMENT_CHOICES,
29-
CARD_INNER_TYPE_CHOICES,
30-
CARD_LAYOUT_TYPE_CHOICES,
31-
)
17+
from .constants import CARD_ALIGNMENT_CHOICES, CARD_INNER_TYPE_CHOICES, CARD_LAYOUT_TYPE_CHOICES
18+
3219

3320
# card allow for a transparent color
3421
CARD_COLOR_STYLE_CHOICES = settings.COLOR_STYLE_CHOICES + (("transparent", _("Transparent")),)

‎djangocms_frontend/contrib/card/frameworks/bootstrap5.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
from djangocms_frontend.contrib.grid.frameworks.bootstrap5 import (
2-
get_row_cols_grid_values,
3-
)
1+
from djangocms_frontend.contrib.grid.frameworks.bootstrap5 import get_row_cols_grid_values
42

53

64
class CardRenderMixin:

‎djangocms_frontend/contrib/carousel/forms.py‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
from django import forms
22
from django.db.models.fields.related import ManyToOneRel
33
from django.utils.translation import gettext_lazy as _
4+
45
from entangled.forms import EntangledModelForm
56
from filer.fields.image import AdminImageFormField, FilerImageField
67
from filer.models import Image
78

8-
from djangocms_frontend.fields import (
9-
AttributesFormField,
10-
ButtonGroup,
11-
TagTypeFormField,
12-
TemplateChoiceMixin,
13-
)
9+
from djangocms_frontend.fields import AttributesFormField, ButtonGroup, TagTypeFormField, TemplateChoiceMixin
1410

1511
from ... import settings
1612
from ...common import BackgroundFormMixin
@@ -20,12 +16,10 @@
2016
from .. import carousel
2117
from ..link.forms import LinkFormMixin
2218
from .constants import (
23-
CAROUSEL_ASPECT_RATIO_CHOICES,
24-
CAROUSEL_PAUSE_CHOICES,
25-
CAROUSEL_TEMPLATE_CHOICES,
26-
CAROUSEL_TRANSITION_CHOICES,
19+
CAROUSEL_ASPECT_RATIO_CHOICES, CAROUSEL_PAUSE_CHOICES, CAROUSEL_TEMPLATE_CHOICES, CAROUSEL_TRANSITION_CHOICES,
2720
)
2821

22+
2923
mixin_factory = settings.get_forms(carousel)
3024

3125

‎djangocms_frontend/contrib/grid/cms_plugins.py‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
1-
from cms.plugin_pool import plugin_pool
21
from django.utils.translation import gettext_lazy as _
32

3+
from cms.plugin_pool import plugin_pool
4+
45
from djangocms_frontend import settings
5-
from djangocms_frontend.common import (
6-
AttributesMixin,
7-
BackgroundMixin,
8-
ResponsiveMixin,
9-
SizingMixin,
10-
SpacingMixin,
11-
)
6+
from djangocms_frontend.common import AttributesMixin, BackgroundMixin, ResponsiveMixin, SizingMixin, SpacingMixin
127

138
from ...cms_plugins import CMSUIPlugin
149
from ...common import TitleMixin
1510
from ...helpers import add_plugin
1611
from .. import grid
1712
from . import forms, models
1813

14+
1915
mixin_factory = settings.get_renderer(grid)
2016

2117

‎djangocms_frontend/contrib/grid/forms.py‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,23 @@
33
from django import forms
44
from django.core.exceptions import ValidationError
55
from django.utils.translation import gettext_lazy as _
6+
67
from entangled.forms import EntangledModelForm
78

89
from djangocms_frontend import settings
9-
from djangocms_frontend.common import (
10-
BackgroundFormMixin,
11-
ResponsiveFormMixin,
12-
SizingFormMixin,
13-
SpacingFormMixin,
14-
)
15-
from djangocms_frontend.fields import (
16-
AttributesFormField,
17-
AutoNumberInput,
18-
ButtonGroup,
19-
IconGroup,
20-
TagTypeFormField,
21-
)
10+
from djangocms_frontend.common import BackgroundFormMixin, ResponsiveFormMixin, SizingFormMixin, SpacingFormMixin
11+
from djangocms_frontend.fields import AttributesFormField, AutoNumberInput, ButtonGroup, IconGroup, TagTypeFormField
2212
from djangocms_frontend.helpers import first_choice, link_to_framework_doc
2313
from djangocms_frontend.models import FrontendUIItem
2414

2515
from ...common.title import TitleFormMixin
2616
from .. import grid
2717
from .constants import (
28-
GRID_COLUMN_ALIGNMENT_CHOICES,
29-
GRID_CONTAINER_CHOICES,
30-
GRID_ROW_HORIZONTAL_ALIGNMENT_CHOICES,
31-
GRID_ROW_VERTICAL_ALIGNMENT_CHOICES,
32-
GRID_SIZE,
18+
GRID_COLUMN_ALIGNMENT_CHOICES, GRID_CONTAINER_CHOICES, GRID_ROW_HORIZONTAL_ALIGNMENT_CHOICES,
19+
GRID_ROW_VERTICAL_ALIGNMENT_CHOICES, GRID_SIZE,
3320
)
3421

22+
3523
mixin_factory = settings.get_forms(grid)
3624

3725

‎djangocms_frontend/contrib/icon/forms.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
from django import forms
22
from django.utils.translation import gettext_lazy as _
3+
34
from entangled.forms import EntangledModelForm
45

5-
from djangocms_frontend.fields import (
6-
AttributesFormField,
7-
ColoredButtonGroup,
8-
TagTypeFormField,
9-
)
6+
from djangocms_frontend.fields import AttributesFormField, ColoredButtonGroup, TagTypeFormField
107

118
from ... import settings
129
from ...common import BackgroundFormMixin, ResponsiveFormMixin, SpacingFormMixin

0 commit comments

Comments
 (0)