diff --git a/examples/simple/settings/base.py b/examples/simple/settings/base.py index cced8c6b..da98a3ac 100644 --- a/examples/simple/settings/base.py +++ b/examples/simple/settings/base.py @@ -223,6 +223,7 @@ INSTALLED_APPS = [ "fobi.contrib.plugins.form_elements.fields.decimal", "fobi.contrib.plugins.form_elements.fields.duration", "fobi.contrib.plugins.form_elements.fields.email", + "fobi.contrib.plugins.form_elements.fields.email_repeat", "fobi.contrib.plugins.form_elements.fields.file", "fobi.contrib.plugins.form_elements.fields.float", "fobi.contrib.plugins.form_elements.fields.hidden", @@ -565,7 +566,7 @@ LOGGING = { }, "root": { "level": "INFO", - "handlers": ["all_log"], + "handlers": ["console"], }, "formatters": { "verbose": { @@ -585,54 +586,27 @@ LOGGING = { "class": "logging.StreamHandler", "formatter": "verbose", }, - "all_log": { - "level": "DEBUG", - "class": "logging.handlers.RotatingFileHandler", - "filename": PROJECT_DIR("../../logs/all.log"), - "maxBytes": 1048576, - "backupCount": 99, - "formatter": "verbose", - }, - "django_log": { - "level": "DEBUG", - "class": "logging.handlers.RotatingFileHandler", - "filename": PROJECT_DIR("../../logs/django.log"), - "maxBytes": 1048576, - "backupCount": 99, - "formatter": "verbose", - }, - "django_request_log": { - "level": "DEBUG", - "class": "logging.handlers.RotatingFileHandler", - "filename": PROJECT_DIR("../../logs/django_request.log"), - "maxBytes": 1048576, - "backupCount": 99, - "formatter": "verbose", - }, - "fobi_log": { - "level": "DEBUG", - "class": "logging.handlers.RotatingFileHandler", - "filename": PROJECT_DIR("../../logs/fobi.log"), - "maxBytes": 1048576, - "backupCount": 99, - "formatter": "verbose", - }, }, "loggers": { "django.request": { - "handlers": ["django_request_log"], + "handlers": ["console"], "level": "INFO", "propagate": True, }, "django": { - "handlers": ["django_log"], + "handlers": ["console"], "level": "ERROR", "propagate": False, }, "fobi": { - "handlers": ["console", "fobi_log"], + "handlers": ["console"], "level": "DEBUG", - "propagate": True, + "propagate": False, + }, + "": { + "handlers": ["console"], + "level": "DEBUG", + "propagate": False, }, }, } diff --git a/examples/simple/settings/local_settings.example b/examples/simple/settings/local_settings.example index c6c156ad..88ddf803 100644 --- a/examples/simple/settings/local_settings.example +++ b/examples/simple/settings/local_settings.example @@ -71,8 +71,3 @@ os.environ.setdefault( 'FOBI_SOURCE_PATH', '/home/user/repose/django-fobi/src' ) - -try: - from .loca_settings import TEST_DATABASES as DATABASES -except: - pass diff --git a/pyproject.toml b/pyproject.toml index 088642f9..03b889b4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ [tool.black] line-length = 80 -target-version = ['py39'] +target-version = ['py37', 'py38', 'py39',] include = '\.pyi?$' exclude = ''' /( @@ -28,3 +28,75 @@ exclude = ''' | profiling )/ ''' + +[tool.isort] +profile = "black" +combine_as_imports = true +multi_line_output = 3 +include_trailing_comma = true +force_grid_wrap = 0 +use_parentheses = true +ensure_newline_before_comments = true +line_length = 80 +known_first_party = [ + "admin_tools_dashboard", + "bar", + "cmd_addons", + "customauth", + "factories", + "fobi", + "fobi_locale", + "foo", + "foreign_key_to_saved_form_data_entry", + "locale", + "override_radio_plugin", + "override_select_model_object_plugin", + "override_simple_theme", + "page", + "registration_addons", + "runserver", + "settings", + "templates", + "urls", +] + +known_third_party = ["django", "factory"] +skip = ["wsgi.py", "migrations/"] + +[tool.ruff] +line-length = 80 + +# Enable Pyflakes `E` and `F` codes by default. +select = ["E", "F"] +ignore = [] + +# Exclude a variety of commonly ignored directories. +exclude = [ + ".bzr", + ".direnv", + ".eggs", + ".git", + ".hg", + ".mypy_cache", + ".nox", + ".pants.d", + ".ruff_cache", + ".svn", + ".tox", + ".venv", + "__pypackages__", + "_build", + "buck-out", + "build", + "dist", + "node_modules", + "venv", + "examples/simple/wsgi.py", +] +per-file-ignores = {} + +# Allow unused variables when underscore-prefixed. +dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$" + +# Assume Python 3.10. +target-version = "py310" diff --git a/src/fobi/apps.py b/src/fobi/apps.py index 8fa09e67..336a6d4c 100644 --- a/src/fobi/apps.py +++ b/src/fobi/apps.py @@ -12,5 +12,6 @@ try: name = label = "fobi" + except ImportError: pass diff --git a/src/fobi/contrib/apps/djangocms_integration/cms_plugins.py b/src/fobi/contrib/apps/djangocms_integration/cms_plugins.py index 19be00b1..7f8a296f 100644 --- a/src/fobi/contrib/apps/djangocms_integration/cms_plugins.py +++ b/src/fobi/contrib/apps/djangocms_integration/cms_plugins.py @@ -2,11 +2,11 @@ from cms.plugin_base import CMSPluginBase from cms.plugin_pool import plugin_pool from django.utils.translation import gettext_lazy as _ +from fobi.integration.processors import IntegrationProcessor + from .models import FobiFormWidget from .settings import WIDGET_FORM_SENT_GET_PARAM -from fobi.integration.processors import IntegrationProcessor - __title__ = "fobi.contrib.apps.djangocms_integration.cms_plugins" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/apps/djangocms_integration/helpers.py b/src/fobi/contrib/apps/djangocms_integration/helpers.py index 4ab2acf6..4d0c7c00 100644 --- a/src/fobi/contrib/apps/djangocms_integration/helpers.py +++ b/src/fobi/contrib/apps/djangocms_integration/helpers.py @@ -1,7 +1,7 @@ -from .settings import FORM_TEMPLATE_CHOICES, SUCCESS_PAGE_TEMPLATE_CHOICES - from fobi.integration.helpers import get_template_choices +from .settings import FORM_TEMPLATE_CHOICES, SUCCESS_PAGE_TEMPLATE_CHOICES + __title__ = "fobi.contrib.apps.djangocms_integration.helpers" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/apps/djangocms_integration/migrations/0001_initial.py b/src/fobi/contrib/apps/djangocms_integration/migrations/0001_initial.py index aa4d9f99..1c677992 100644 --- a/src/fobi/contrib/apps/djangocms_integration/migrations/0001_initial.py +++ b/src/fobi/contrib/apps/djangocms_integration/migrations/0001_initial.py @@ -2,8 +2,8 @@ # Generated by Django 1.11.7 on 2018-02-16 13:18 from __future__ import unicode_literals -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/src/fobi/contrib/apps/feincms_integration/helpers.py b/src/fobi/contrib/apps/feincms_integration/helpers.py index c2b179bb..6a408f93 100644 --- a/src/fobi/contrib/apps/feincms_integration/helpers.py +++ b/src/fobi/contrib/apps/feincms_integration/helpers.py @@ -1,7 +1,7 @@ -from .settings import FORM_TEMPLATE_CHOICES, SUCCESS_PAGE_TEMPLATE_CHOICES - from fobi.integration.helpers import get_template_choices +from .settings import FORM_TEMPLATE_CHOICES, SUCCESS_PAGE_TEMPLATE_CHOICES + __title__ = "fobi.contrib.apps.feincms_integration.helpers" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/apps/feincms_integration/widgets.py b/src/fobi/contrib/apps/feincms_integration/widgets.py index a158fb4e..07971dbf 100644 --- a/src/fobi/contrib/apps/feincms_integration/widgets.py +++ b/src/fobi/contrib/apps/feincms_integration/widgets.py @@ -2,14 +2,14 @@ from django.db import models from django.utils.translation import gettext, gettext_lazy as _ from six import python_2_unicode_compatible +from fobi.integration.processors import IntegrationProcessor + from .helpers import ( get_form_template_choices, get_success_page_template_choices, ) from .settings import WIDGET_FORM_SENT_GET_PARAM -from fobi.integration.processors import IntegrationProcessor - __title__ = "fobi.contrib.apps.feincms_integration.widgets" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/apps/mezzanine_integration/helpers.py b/src/fobi/contrib/apps/mezzanine_integration/helpers.py index 2e342f55..d00c83f0 100644 --- a/src/fobi/contrib/apps/mezzanine_integration/helpers.py +++ b/src/fobi/contrib/apps/mezzanine_integration/helpers.py @@ -1,7 +1,7 @@ -from .settings import FORM_TEMPLATE_CHOICES, SUCCESS_PAGE_TEMPLATE_CHOICES - from fobi.integration.helpers import get_template_choices +from .settings import FORM_TEMPLATE_CHOICES, SUCCESS_PAGE_TEMPLATE_CHOICES + __title__ = "fobi.contrib.apps.mezzanine_integration.helpers" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/apps/mezzanine_integration/page_processors.py b/src/fobi/contrib/apps/mezzanine_integration/page_processors.py index fa77f0b1..f0a1ab9d 100644 --- a/src/fobi/contrib/apps/mezzanine_integration/page_processors.py +++ b/src/fobi/contrib/apps/mezzanine_integration/page_processors.py @@ -1,10 +1,10 @@ from mezzanine.pages.page_processors import processor_for +from fobi.integration.processors import IntegrationProcessor + from .models import FobiFormPage from .settings import WIDGET_FORM_SENT_GET_PARAM -from fobi.integration.processors import IntegrationProcessor - __title__ = "fobi.contrib.apps.mezzanine_integration.page_processors" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/apps/wagtail_integration/helpers.py b/src/fobi/contrib/apps/wagtail_integration/helpers.py index b4917fc0..278a76f3 100644 --- a/src/fobi/contrib/apps/wagtail_integration/helpers.py +++ b/src/fobi/contrib/apps/wagtail_integration/helpers.py @@ -1,7 +1,7 @@ -from .settings import FORM_TEMPLATE_CHOICES, SUCCESS_PAGE_TEMPLATE_CHOICES - from fobi.integration.helpers import get_template_choices +from .settings import FORM_TEMPLATE_CHOICES, SUCCESS_PAGE_TEMPLATE_CHOICES + __title__ = "fobi.contrib.apps.wagtail_integration.helpers" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/apps/wagtail_integration/migrations/0001_initial.py b/src/fobi/contrib/apps/wagtail_integration/migrations/0001_initial.py index cc6fc585..479a0f1a 100644 --- a/src/fobi/contrib/apps/wagtail_integration/migrations/0001_initial.py +++ b/src/fobi/contrib/apps/wagtail_integration/migrations/0001_initial.py @@ -2,8 +2,8 @@ # Generated by Django 1.10.7 on 2017-06-14 20:58 from __future__ import unicode_literals -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/src/fobi/contrib/plugins/form_elements/content/content_image/base.py b/src/fobi/contrib/plugins/form_elements/content/content_image/base.py index cc0b3adc..ebda7523 100644 --- a/src/fobi/contrib/plugins/form_elements/content/content_image/base.py +++ b/src/fobi/contrib/plugins/form_elements/content/content_image/base.py @@ -8,6 +8,9 @@ from django.template.loader import render_to_string from django.utils.translation import gettext_lazy as _ from nonefield.fields import NoneField +from fobi.base import FormElementPlugin +from fobi.helpers import clone_file, delete_file + from . import UID from .forms import ContentImageForm from .helpers import get_crop_filter @@ -17,9 +20,6 @@ from .settings import ( IMAGES_UPLOAD_DIR, ) -from fobi.base import FormElementPlugin -from fobi.helpers import clone_file, delete_file - __title__ = "fobi.contrib.plugins.form_elements.content.content_image.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2022 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/content/content_image/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/content/content_image/fobi_form_elements.py index b552a668..585b08a6 100644 --- a/src/fobi/contrib/plugins/form_elements/content/content_image/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/content/content_image/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import ContentImagePlugin - from fobi.base import form_element_plugin_registry +from .base import ContentImagePlugin + __title__ = ( "fobi.contrib.plugins.form_elements.content.content_image." "fobi_form_elements" diff --git a/src/fobi/contrib/plugins/form_elements/content/content_image/forms.py b/src/fobi/contrib/plugins/form_elements/content/content_image/forms.py index 8e1dd673..78bd44c2 100644 --- a/src/fobi/contrib/plugins/form_elements/content/content_image/forms.py +++ b/src/fobi/contrib/plugins/form_elements/content/content_image/forms.py @@ -1,6 +1,9 @@ from django import forms from django.utils.translation import gettext_lazy as _ +from fobi.base import BasePluginForm, get_theme +from fobi.helpers import handle_uploaded_file + from .settings import ( DEFAULT_FIT_METHOD, DEFAULT_SIZE, @@ -9,9 +12,6 @@ from .settings import ( SIZES, ) -from fobi.base import BasePluginForm, get_theme -from fobi.helpers import handle_uploaded_file - __title__ = "fobi.contrib.plugins.form_elements.content.content_image.forms" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/content/content_image_url/base.py b/src/fobi/contrib/plugins/form_elements/content/content_image_url/base.py index 651c54af..eb1412d5 100644 --- a/src/fobi/contrib/plugins/form_elements/content/content_image_url/base.py +++ b/src/fobi/contrib/plugins/form_elements/content/content_image_url/base.py @@ -7,12 +7,12 @@ from django.template.loader import render_to_string from django.utils.translation import gettext_lazy as _ from nonefield.fields import NoneField +from fobi.base import FormElementPlugin + from . import UID from .forms import ContentImageURLForm from .settings import FIT_METHOD_FIT_HEIGHT, FIT_METHOD_FIT_WIDTH -from fobi.base import FormElementPlugin - __title__ = "fobi.contrib.plugins.form_elements.content.content_image_url.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2022 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/content/content_image_url/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/content/content_image_url/fobi_form_elements.py index 2645e5e9..687c1d15 100644 --- a/src/fobi/contrib/plugins/form_elements/content/content_image_url/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/content/content_image_url/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import ContentImageURLPlugin - from fobi.base import form_element_plugin_registry +from .base import ContentImageURLPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.content.content_image." "fobi_form_elements" diff --git a/src/fobi/contrib/plugins/form_elements/content/content_image_url/forms.py b/src/fobi/contrib/plugins/form_elements/content/content_image_url/forms.py index 74b168a0..202ed017 100644 --- a/src/fobi/contrib/plugins/form_elements/content/content_image_url/forms.py +++ b/src/fobi/contrib/plugins/form_elements/content/content_image_url/forms.py @@ -1,6 +1,8 @@ from django import forms from django.utils.translation import gettext_lazy as _ +from fobi.base import BasePluginForm, get_theme + from .settings import ( DEFAULT_FIT_METHOD, DEFAULT_SIZE, @@ -8,8 +10,6 @@ from .settings import ( SIZES, ) -from fobi.base import BasePluginForm, get_theme - # from fobi.widgets import NumberInput diff --git a/src/fobi/contrib/plugins/form_elements/content/content_markdown/base.py b/src/fobi/contrib/plugins/form_elements/content/content_markdown/base.py index 9702c626..e66c62db 100644 --- a/src/fobi/contrib/plugins/form_elements/content/content_markdown/base.py +++ b/src/fobi/contrib/plugins/form_elements/content/content_markdown/base.py @@ -6,12 +6,12 @@ from uuid import uuid4 from django.utils.translation import gettext_lazy as _ from nonefield.fields import NoneField -from . import UID -from .forms import ContentMarkdownForm - from fobi.base import FormElementPlugin from fobi.reusable.markdown_widget.helpers import convert_to_markdown +from . import UID +from .forms import ContentMarkdownForm + __title__ = "fobi.contrib.plugins.form_elements.content.content_richtext.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2022 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/content/content_markdown/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/content/content_markdown/fobi_form_elements.py index d55400e5..93a10a76 100644 --- a/src/fobi/contrib/plugins/form_elements/content/content_markdown/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/content/content_markdown/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import ContentMarkdownPlugin - from fobi.base import form_element_plugin_registry +from .base import ContentMarkdownPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.content.content_markdown." "fobi_form_elements" diff --git a/src/fobi/contrib/plugins/form_elements/content/content_markdown/widgets.py b/src/fobi/contrib/plugins/form_elements/content/content_markdown/widgets.py index c3f5fa29..6a3da94b 100644 --- a/src/fobi/contrib/plugins/form_elements/content/content_markdown/widgets.py +++ b/src/fobi/contrib/plugins/form_elements/content/content_markdown/widgets.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from . import UID - from fobi.base import FormElementPluginWidget +from . import UID + __title__ = ( "fobi.contrib.plugins.form_elements.content." "content_markdown.widgets" ) diff --git a/src/fobi/contrib/plugins/form_elements/content/content_richtext/base.py b/src/fobi/contrib/plugins/form_elements/content/content_richtext/base.py index 379469fb..622f0c48 100644 --- a/src/fobi/contrib/plugins/form_elements/content/content_richtext/base.py +++ b/src/fobi/contrib/plugins/form_elements/content/content_richtext/base.py @@ -7,11 +7,11 @@ from django.utils.encoding import smart_str from django.utils.translation import gettext_lazy as _ from nonefield.fields import NoneField +from fobi.base import FormElementPlugin + from . import UID from .forms import ContentRichTextForm -from fobi.base import FormElementPlugin - __title__ = "fobi.contrib.plugins.form_elements.content.content_richtext.base" __author__ = "Frantisek Holop " __copyright__ = "RIPE NCC" diff --git a/src/fobi/contrib/plugins/form_elements/content/content_richtext/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/content/content_richtext/fobi_form_elements.py index 44075b5d..f4c637cf 100644 --- a/src/fobi/contrib/plugins/form_elements/content/content_richtext/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/content/content_richtext/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import ContentRichTextPlugin - from fobi.base import form_element_plugin_registry +from .base import ContentRichTextPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.content.content_richtext." "fobi_form_elements" diff --git a/src/fobi/contrib/plugins/form_elements/content/content_richtext/forms.py b/src/fobi/contrib/plugins/form_elements/content/content_richtext/forms.py index b31187a5..78399177 100644 --- a/src/fobi/contrib/plugins/form_elements/content/content_richtext/forms.py +++ b/src/fobi/contrib/plugins/form_elements/content/content_richtext/forms.py @@ -13,7 +13,7 @@ try: except ImportError: BLEACH_INSTALLED = False BLEACH_VERSION = False - + __title__ = "fobi.contrib.plugins.form_elements.content.content_richtext.forms" __author__ = "Frantisek Holop " @@ -50,26 +50,31 @@ class ContentRichTextForm(forms.Form, BasePluginForm): "FOBI_PLUGIN_CONTENT_RICHTEXT_ALLOWED_ATTRIBUTES", bleach.ALLOWED_ATTRIBUTES, ) - - if BLEACH_VERSION > '5.0.0': - from bleach.css_sanitizer import CSSSanitizer - from bleach.css_sanitizer import ALLOWED_CSS_PROPERTIES - css_sanitizer = CSSSanitizer(allowed_css_properties=getattr( - settings, - "FOBI_PLUGIN_CONTENT_RICHTEXT_ALLOWED_STYLES", + + if BLEACH_VERSION > "5.0.0": + from bleach.css_sanitizer import ( ALLOWED_CSS_PROPERTIES, - )) + CSSSanitizer, + ) + + css_sanitizer = CSSSanitizer( + allowed_css_properties=getattr( + settings, + "FOBI_PLUGIN_CONTENT_RICHTEXT_ALLOWED_STYLES", + ALLOWED_CSS_PROPERTIES, + ) + ) return bleach.clean( text=self.cleaned_data["text"], tags=allowed_tags, attributes=allowed_attrs, strip=True, strip_comments=True, - css_sanitizer=css_sanitizer + css_sanitizer=css_sanitizer, ) - + else: - + allowed_styles = getattr( settings, "FOBI_PLUGIN_CONTENT_RICHTEXT_ALLOWED_STYLES", diff --git a/src/fobi/contrib/plugins/form_elements/content/content_richtext/widgets.py b/src/fobi/contrib/plugins/form_elements/content/content_richtext/widgets.py index 2431c365..0a96f50c 100644 --- a/src/fobi/contrib/plugins/form_elements/content/content_richtext/widgets.py +++ b/src/fobi/contrib/plugins/form_elements/content/content_richtext/widgets.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from . import UID - from fobi.base import FormElementPluginWidget +from . import UID + __title__ = ( "fobi.contrib.plugins.form_elements.content." "content_richtext.widgets" ) diff --git a/src/fobi/contrib/plugins/form_elements/content/content_text/base.py b/src/fobi/contrib/plugins/form_elements/content/content_text/base.py index f85fc926..e6360177 100644 --- a/src/fobi/contrib/plugins/form_elements/content/content_text/base.py +++ b/src/fobi/contrib/plugins/form_elements/content/content_text/base.py @@ -7,11 +7,11 @@ from django.utils.encoding import smart_str from django.utils.translation import gettext_lazy as _ from nonefield.fields import NoneField +from fobi.base import FormElementPlugin + from . import UID from .forms import ContentTextForm -from fobi.base import FormElementPlugin - __title__ = "fobi.contrib.plugins.form_elements.content.content_text.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2022 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/content/content_text/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/content/content_text/fobi_form_elements.py index 52278429..e41cf1a1 100644 --- a/src/fobi/contrib/plugins/form_elements/content/content_text/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/content/content_text/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import ContentTextPlugin - from fobi.base import form_element_plugin_registry +from .base import ContentTextPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.content.content_text." "fobi_form_elements" diff --git a/src/fobi/contrib/plugins/form_elements/content/content_text/forms.py b/src/fobi/contrib/plugins/form_elements/content/content_text/forms.py index 052833c1..8397d45f 100644 --- a/src/fobi/contrib/plugins/form_elements/content/content_text/forms.py +++ b/src/fobi/contrib/plugins/form_elements/content/content_text/forms.py @@ -3,10 +3,10 @@ from django.forms.widgets import Textarea from django.utils.html import strip_tags from django.utils.translation import gettext_lazy as _ -from .settings import ALLOWED_ATTRIBUTES, ALLOWED_TAGS - from fobi.base import BasePluginForm, get_theme +from .settings import ALLOWED_ATTRIBUTES, ALLOWED_TAGS + try: import bleach diff --git a/src/fobi/contrib/plugins/form_elements/content/content_video/base.py b/src/fobi/contrib/plugins/form_elements/content/content_video/base.py index 6957f604..362ce446 100644 --- a/src/fobi/contrib/plugins/form_elements/content/content_video/base.py +++ b/src/fobi/contrib/plugins/form_elements/content/content_video/base.py @@ -7,11 +7,11 @@ from django.utils.translation import gettext_lazy as _ from nonefield.fields import NoneField from vishap import render_video +from fobi.base import FormElementPlugin + from . import UID from .forms import ContentVideoForm -from fobi.base import FormElementPlugin - __title__ = "fobi.contrib.plugins.form_elements.content.content_video.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2022 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/content/content_video/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/content/content_video/fobi_form_elements.py index 5c10acb6..6c7ce377 100644 --- a/src/fobi/contrib/plugins/form_elements/content/content_video/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/content/content_video/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import ContentVideoPlugin - from fobi.base import form_element_plugin_registry +from .base import ContentVideoPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.content.content_video." "fobi_form_elements" diff --git a/src/fobi/contrib/plugins/form_elements/content/content_video/forms.py b/src/fobi/contrib/plugins/form_elements/content/content_video/forms.py index 4aab6028..d00261a4 100644 --- a/src/fobi/contrib/plugins/form_elements/content/content_video/forms.py +++ b/src/fobi/contrib/plugins/form_elements/content/content_video/forms.py @@ -1,10 +1,10 @@ from django import forms from django.utils.translation import gettext_lazy as _ -from .settings import DEFAULT_SIZE, SIZES - from fobi.base import BasePluginForm, get_theme +from .settings import DEFAULT_SIZE, SIZES + __title__ = "fobi.contrib.plugins.form_elements.content.content_video.forms" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/boolean/base.py b/src/fobi/contrib/plugins/form_elements/fields/boolean/base.py index edffef2c..b930ddb1 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/boolean/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/boolean/base.py @@ -1,11 +1,11 @@ from django.forms.fields import BooleanField from django.utils.translation import gettext_lazy as _ +from fobi.base import FormFieldPlugin + from . import UID from .forms import BooleanSelectForm -from fobi.base import FormFieldPlugin - __title__ = "fobi.contrib.plugins.form_elements.fields.boolean.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/boolean/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/boolean/fobi_form_elements.py index 10376d4e..2752d746 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/boolean/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/boolean/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import BooleanSelectPlugin - from fobi.base import form_element_plugin_registry +from .base import BooleanSelectPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields.boolean." "fobi_form_elements" ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/checkbox_select_multiple/base.py b/src/fobi/contrib/plugins/form_elements/fields/checkbox_select_multiple/base.py index fb1a3b62..fe15f84d 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/checkbox_select_multiple/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/checkbox_select_multiple/base.py @@ -2,14 +2,14 @@ from django.forms.fields import MultipleChoiceField from django.forms.widgets import CheckboxSelectMultiple from django.utils.translation import gettext_lazy as _ -from . import UID -from .forms import CheckboxSelectMultipleInputForm -from .settings import SUBMIT_VALUE_AS - from fobi.base import FormFieldPlugin, get_theme from fobi.constants import SUBMIT_VALUE_AS_REPR, SUBMIT_VALUE_AS_VAL from fobi.helpers import get_select_field_choices, safe_text +from . import UID +from .forms import CheckboxSelectMultipleInputForm +from .settings import SUBMIT_VALUE_AS + theme = get_theme(request=None, as_instance=True) __title__ = ( diff --git a/src/fobi/contrib/plugins/form_elements/fields/checkbox_select_multiple/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/checkbox_select_multiple/fobi_form_elements.py index cf6218c6..9429616c 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/checkbox_select_multiple/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/checkbox_select_multiple/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import CheckboxSelectMultipleInputPlugin - from fobi.base import form_element_plugin_registry +from .base import CheckboxSelectMultipleInputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "checkbox_select_multiple.fobi_form_elements" diff --git a/src/fobi/contrib/plugins/form_elements/fields/date/base.py b/src/fobi/contrib/plugins/form_elements/fields/date/base.py index 46622f5b..31f91586 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/date/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/date/base.py @@ -4,11 +4,11 @@ from django.forms.fields import DateField from django.forms.widgets import DateInput from django.utils.translation import gettext_lazy as _ +from fobi.base import FormFieldPlugin, get_theme + from . import UID from .forms import DateInputForm -from fobi.base import FormFieldPlugin, get_theme - __title__ = "fobi.contrib.plugins.form_elements.fields.date.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/date/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/date/fobi_form_elements.py index ec40cfbe..945d17c6 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/date/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/date/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import DateInputPlugin - from fobi.base import form_element_plugin_registry +from .base import DateInputPlugin + __title__ = "fobi.contrib.plugins.form_elements.fields.date.fobi_form_elements" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/date/widgets.py b/src/fobi/contrib/plugins/form_elements/fields/date/widgets.py index 18ecd880..7e978384 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/date/widgets.py +++ b/src/fobi/contrib/plugins/form_elements/fields/date/widgets.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from . import UID - from fobi.base import FormElementPluginWidget +from . import UID + __title__ = "fobi.contrib.plugins.form_elements.fields.date.widgets" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/date_drop_down/base.py b/src/fobi/contrib/plugins/form_elements/fields/date_drop_down/base.py index 7dd8c9b2..8833cb5a 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/date_drop_down/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/date_drop_down/base.py @@ -4,11 +4,11 @@ from django.forms.fields import DateField from django.forms.widgets import SelectDateWidget from django.utils.translation import gettext_lazy as _ +from fobi.base import FormFieldPlugin, get_theme + from . import UID from .forms import DateDropDownInputForm -from fobi.base import FormFieldPlugin, get_theme - __title__ = "fobi.contrib.plugins.form_elements.fields." "date_drop_down.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/date_drop_down/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/date_drop_down/fobi_form_elements.py index 66653470..47dce268 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/date_drop_down/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/date_drop_down/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import DateDropDownInputPlugin - from fobi.base import form_element_plugin_registry +from .base import DateDropDownInputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "date_drop_down.fobi_form_elements" diff --git a/src/fobi/contrib/plugins/form_elements/fields/datetime/base.py b/src/fobi/contrib/plugins/form_elements/fields/datetime/base.py index 5818bc8c..7d741db7 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/datetime/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/datetime/base.py @@ -4,11 +4,11 @@ from django.forms.fields import DateTimeField from django.forms.widgets import DateTimeInput from django.utils.translation import gettext_lazy as _ +from fobi.base import FormFieldPlugin, get_theme + from . import UID from .forms import DateTimeInputForm -from fobi.base import FormFieldPlugin, get_theme - __title__ = "fobi.contrib.plugins.form_elements.fields." "datetime.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/datetime/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/datetime/fobi_form_elements.py index e4029348..f836eadd 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/datetime/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/datetime/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import DateTimeInputPlugin - from fobi.base import form_element_plugin_registry +from .base import DateTimeInputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "datetime.fobi_form_elements" ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/datetime/widgets.py b/src/fobi/contrib/plugins/form_elements/fields/datetime/widgets.py index 23a8b5c9..898ef58a 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/datetime/widgets.py +++ b/src/fobi/contrib/plugins/form_elements/fields/datetime/widgets.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from . import UID - from fobi.base import FormElementPluginWidget +from . import UID + __title__ = "fobi.contrib.plugins.form_elements.fields.datetime.widgets" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/decimal/base.py b/src/fobi/contrib/plugins/form_elements/fields/decimal/base.py index d2f92cc9..811ed617 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/decimal/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/decimal/base.py @@ -5,12 +5,12 @@ import decimal from django.forms.fields import DecimalField from django.utils.translation import gettext_lazy as _ -from . import UID -from .forms import DecimalInputForm - from fobi.base import FormFieldPlugin, get_theme from fobi.widgets import NumberInput +from . import UID +from .forms import DecimalInputForm + __title__ = "fobi.contrib.plugins.form_elements.fields." "decimal.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/decimal/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/decimal/fobi_form_elements.py index 427a568d..afe9ea1b 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/decimal/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/decimal/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import DecimalInputPlugin - from fobi.base import form_element_plugin_registry +from .base import DecimalInputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "decimal.fobi_form_elements" ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/duration/base.py b/src/fobi/contrib/plugins/form_elements/fields/duration/base.py index 7184d817..0077217e 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/duration/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/duration/base.py @@ -7,11 +7,11 @@ from django.forms.widgets import TextInput from django.utils.duration import duration_string from django.utils.translation import gettext_lazy as _ +from fobi.base import FormFieldPlugin, get_theme + from . import UID from .forms import DurationInputForm -from fobi.base import FormFieldPlugin, get_theme - __title__ = "fobi.contrib.plugins.form_elements.fields.duration.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/duration/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/duration/fobi_form_elements.py index 49dc6555..4f78590c 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/duration/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/duration/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import DurationInputPlugin - from fobi.base import form_element_plugin_registry +from .base import DurationInputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields.duration." "fobi_form_elements" ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/email/base.py b/src/fobi/contrib/plugins/form_elements/fields/email/base.py index eff2acbb..743bf2c7 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/email/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/email/base.py @@ -4,11 +4,11 @@ from django.forms.fields import EmailField from django.forms.widgets import TextInput from django.utils.translation import gettext_lazy as _ +from fobi.base import FormFieldPlugin, get_theme + from . import UID from .forms import EmailInputForm -from fobi.base import FormFieldPlugin, get_theme - __title__ = ( "fobi.contrib.plugins.form_elements.fields." "email.fobi_form_elements" ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/email/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/email/fobi_form_elements.py index 335688c6..3af7c8ab 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/email/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/email/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import EmailInputPlugin - from fobi.base import form_element_plugin_registry +from .base import EmailInputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "email.fobi_form_elements" ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/email_repeat/base.py b/src/fobi/contrib/plugins/form_elements/fields/email_repeat/base.py index 37362f45..9027dd24 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/email_repeat/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/email_repeat/base.py @@ -4,16 +4,14 @@ from django.forms.fields import EmailField from django.forms.widgets import TextInput from django.utils.translation import gettext_lazy as _ -from . import UID -from .forms import EmailRepeatInputForm - from fobi.base import FormFieldPlugin, get_theme from fobi.reusable.email_repeat.field import EmailRepeatField from fobi.reusable.email_repeat.widget import EmailRepeatWidget -__title__ = ( - "fobi.contrib.plugins.form_elements.fields.email.fobi_form_elements" -) +from . import UID +from .forms import EmailRepeatInputForm + +__title__ = "fobi.contrib.plugins.form_elements.fields.email.fobi_form_elements" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" __license__ = "GPL 2.0/LGPL 2.1" diff --git a/src/fobi/contrib/plugins/form_elements/fields/email_repeat/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/email_repeat/fobi_form_elements.py index a3e16987..e0732458 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/email_repeat/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/email_repeat/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import EmailRepeatInputPlugin - from fobi.base import form_element_plugin_registry +from .base import EmailRepeatInputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields.email_repeat.fobi_form_elements" ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/file/base.py b/src/fobi/contrib/plugins/form_elements/fields/file/base.py index 0ff27237..6364c381 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/file/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/file/base.py @@ -6,14 +6,14 @@ from django.conf import settings from django.forms.widgets import ClearableFileInput from django.utils.translation import gettext_lazy as _ +from fobi.base import FormFieldPlugin +from fobi.helpers import handle_uploaded_file + from . import UID from .fields import AllowedExtensionsFileField as FileField from .forms import FileInputForm from .settings import FILES_UPLOAD_DIR -from fobi.base import FormFieldPlugin -from fobi.helpers import handle_uploaded_file - __title__ = "fobi.contrib.plugins.form_elements.fields.file.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/file/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/file/fobi_form_elements.py index 123e1a7d..35db9524 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/file/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/file/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import FileInputPlugin - from fobi.base import form_element_plugin_registry +from .base import FileInputPlugin + __title__ = "fobi.contrib.plugins.form_elements.fields.file.fobi_form_elements" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/float/base.py b/src/fobi/contrib/plugins/form_elements/fields/float/base.py index 42ad9289..fdb565b4 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/float/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/float/base.py @@ -3,12 +3,12 @@ from __future__ import absolute_import from django.forms.fields import FloatField from django.utils.translation import gettext_lazy as _ -from . import UID -from .forms import FloatInputForm - from fobi.base import FormFieldPlugin, get_theme from fobi.widgets import NumberInput +from . import UID +from .forms import FloatInputForm + __title__ = "fobi.contrib.plugins.form_elements.fields.float.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/float/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/float/fobi_form_elements.py index 758fa81a..0eeb4423 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/float/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/float/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import FloatInputPlugin - from fobi.base import form_element_plugin_registry +from .base import FloatInputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "float.fobi_form_elements" ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/hidden/base.py b/src/fobi/contrib/plugins/form_elements/fields/hidden/base.py index a46cb8a0..394c7b11 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/hidden/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/hidden/base.py @@ -4,11 +4,11 @@ from django.forms.fields import CharField from django.forms.widgets import HiddenInput from django.utils.translation import gettext_lazy as _ +from fobi.base import FormFieldPlugin, get_theme + from . import UID from .forms import HiddenInputForm -from fobi.base import FormFieldPlugin, get_theme - __title__ = "fobi.contrib.plugins.form_elements.fields.hidden.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/hidden/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/hidden/fobi_form_elements.py index 69321023..f796bdb9 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/hidden/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/hidden/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import HiddenInputPlugin - from fobi.base import form_element_plugin_registry +from .base import HiddenInputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "hidden.fobi_form_elements" ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/input/base.py b/src/fobi/contrib/plugins/form_elements/fields/input/base.py index 0b98e356..77c4db01 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/input/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/input/base.py @@ -4,11 +4,11 @@ from django.forms.fields import Field from django.forms.widgets import TextInput from django.utils.translation import gettext_lazy as _ +from fobi.base import FormFieldPlugin, get_theme + from . import UID from .forms import InputForm -from fobi.base import FormFieldPlugin, get_theme - __title__ = "fobi.contrib.plugins.form_elements.fields.input.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/input/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/input/fobi_form_elements.py index 5dcc0a0b..9a9ffe49 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/input/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/input/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import InputPlugin - from fobi.base import form_element_plugin_registry +from .base import InputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "input.fobi_form_elements" ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/input/forms.py b/src/fobi/contrib/plugins/form_elements/fields/input/forms.py index 9047e240..2a36ffb8 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/input/forms.py +++ b/src/fobi/contrib/plugins/form_elements/fields/input/forms.py @@ -2,12 +2,12 @@ from django import forms from django.core.validators import MinValueValidator from django.utils.translation import gettext_lazy as _ -from .constants import FORM_FIELD_TYPE_CHOICES - from fobi.base import BaseFormFieldPluginForm, get_theme from fobi.settings import DEFAULT_MAX_LENGTH, DEFAULT_MIN_LENGTH from fobi.widgets import NumberInput +from .constants import FORM_FIELD_TYPE_CHOICES + __title__ = "fobi.contrib.plugins.form_elements.fields.input.forms" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/integer/base.py b/src/fobi/contrib/plugins/form_elements/fields/integer/base.py index 81e768de..26f02184 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/integer/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/integer/base.py @@ -3,12 +3,12 @@ from __future__ import absolute_import from django.forms.fields import IntegerField from django.utils.translation import gettext_lazy as _ -from . import UID -from .forms import IntegerInputForm - from fobi.base import FormFieldPlugin, get_theme from fobi.widgets import NumberInput +from . import UID +from .forms import IntegerInputForm + __title__ = "fobi.contrib.plugins.form_elements.fields.integer.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/integer/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/integer/fobi_form_elements.py index 2a8580a4..f67f0694 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/integer/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/integer/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import IntegerInputPlugin - from fobi.base import form_element_plugin_registry +from .base import IntegerInputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "integer.fobi_form_elements" ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/ip_address/base.py b/src/fobi/contrib/plugins/form_elements/fields/ip_address/base.py index 13c5530b..b42aec07 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/ip_address/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/ip_address/base.py @@ -4,11 +4,11 @@ from django.forms.fields import GenericIPAddressField from django.forms.widgets import TextInput from django.utils.translation import gettext_lazy as _ +from fobi.base import FormFieldPlugin, get_theme + from . import UID from .forms import IPAddressInputForm -from fobi.base import FormFieldPlugin, get_theme - __title__ = "fobi.contrib.plugins.form_elements.fields.ip_address.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/ip_address/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/ip_address/fobi_form_elements.py index 93558772..c08f3045 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/ip_address/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/ip_address/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import IPAddressInputPlugin - from fobi.base import form_element_plugin_registry +from .base import IPAddressInputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "ip_address.fobi_form_elements" ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/null_boolean/base.py b/src/fobi/contrib/plugins/form_elements/fields/null_boolean/base.py index fc8e0bef..024f52fa 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/null_boolean/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/null_boolean/base.py @@ -4,11 +4,11 @@ from django.forms.fields import NullBooleanField from django.forms.widgets import NullBooleanSelect from django.utils.translation import gettext_lazy as _ +from fobi.base import FormFieldPlugin, get_theme + from . import UID from .forms import NullBooleanSelectForm -from fobi.base import FormFieldPlugin, get_theme - __title__ = "fobi.contrib.plugins.form_elements.fields.null_boolean.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/null_boolean/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/null_boolean/fobi_form_elements.py index dac78b29..1ca64850 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/null_boolean/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/null_boolean/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import NullBooleanSelectPlugin - from fobi.base import form_element_plugin_registry +from .base import NullBooleanSelectPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "null_boolean.fobi_form_elements" diff --git a/src/fobi/contrib/plugins/form_elements/fields/password/base.py b/src/fobi/contrib/plugins/form_elements/fields/password/base.py index 6a56f958..0e3bba87 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/password/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/password/base.py @@ -4,11 +4,11 @@ from django.forms.fields import CharField from django.forms.widgets import PasswordInput from django.utils.translation import gettext_lazy as _ +from fobi.base import FormFieldPlugin, get_theme + from . import UID from .forms import PasswordInputForm -from fobi.base import FormFieldPlugin, get_theme - __title__ = "fobi.contrib.plugins.form_elements.fields.password.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/password/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/password/fobi_form_elements.py index fd1f59d4..424b9119 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/password/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/password/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import PasswordInputPlugin - from fobi.base import form_element_plugin_registry +from .base import PasswordInputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "password.fobi_form_elements" ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/radio/base.py b/src/fobi/contrib/plugins/form_elements/fields/radio/base.py index f29cd871..40733efe 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/radio/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/radio/base.py @@ -4,14 +4,14 @@ from django.forms.fields import ChoiceField from django.forms.widgets import RadioSelect from django.utils.translation import gettext_lazy as _ -from . import UID -from .forms import RadioInputForm -from .settings import SUBMIT_VALUE_AS - from fobi.base import FormFieldPlugin, get_theme from fobi.constants import SUBMIT_VALUE_AS_REPR, SUBMIT_VALUE_AS_VAL from fobi.helpers import get_select_field_choices, safe_text +from . import UID +from .forms import RadioInputForm +from .settings import SUBMIT_VALUE_AS + __title__ = "fobi.contrib.plugins.form_elements.fields.radio.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/radio/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/radio/fobi_form_elements.py index babb445c..9eaf5924 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/radio/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/radio/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import RadioInputPlugin - from fobi.base import form_element_plugin_registry +from .base import RadioInputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "radio.fobi_form_elements" ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/radio/settings.py b/src/fobi/contrib/plugins/form_elements/fields/radio/settings.py index 61134c61..ef490f7f 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/radio/settings.py +++ b/src/fobi/contrib/plugins/form_elements/fields/radio/settings.py @@ -1,7 +1,7 @@ -from .conf import get_setting - from fobi.helpers import validate_submit_value_as +from .conf import get_setting + __title__ = "fobi.contrib.plugins.form_elements.fields.radio.settings" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/range_select/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/range_select/fobi_form_elements.py index c13bd893..9e9e89b6 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/range_select/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/range_select/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import RangeSelectInputPlugin - from fobi.base import form_element_plugin_registry +from .base import RangeSelectInputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields.range_select." "fobi_form_elements" diff --git a/src/fobi/contrib/plugins/form_elements/fields/range_select/forms.py b/src/fobi/contrib/plugins/form_elements/fields/range_select/forms.py index 150dbffb..2ca13680 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/range_select/forms.py +++ b/src/fobi/contrib/plugins/form_elements/fields/range_select/forms.py @@ -1,6 +1,9 @@ from django import forms from django.utils.translation import gettext_lazy as _ +from fobi.base import BaseFormFieldPluginForm, get_theme +from fobi.widgets import NumberInput + from .settings import ( INITIAL, INITIAL_MAX_VALUE, @@ -10,9 +13,6 @@ from .settings import ( STEP, ) -from fobi.base import BaseFormFieldPluginForm, get_theme -from fobi.widgets import NumberInput - __title__ = "fobi.contrib.plugins.form_elements.fields.range_select.forms" __author__ = "Artur Barseghyan " __copyright__ = "2014-2015 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/regex/base.py b/src/fobi/contrib/plugins/form_elements/fields/regex/base.py index 859ebff1..990c467c 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/regex/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/regex/base.py @@ -4,11 +4,11 @@ from django.forms.fields import RegexField from django.forms.widgets import TextInput from django.utils.translation import gettext_lazy as _ +from fobi.base import FormFieldPlugin, get_theme + from . import UID from .forms import RegexInputForm -from fobi.base import FormFieldPlugin, get_theme - __title__ = "fobi.contrib.plugins.form_elements.fields.regex.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/regex/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/regex/fobi_form_elements.py index 1a7f7a31..5025eda4 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/regex/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/regex/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import RegexInputPlugin - from fobi.base import form_element_plugin_registry +from .base import RegexInputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "regex.fobi_form_elements" ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/select/base.py b/src/fobi/contrib/plugins/form_elements/fields/select/base.py index 62033b55..ebf954d7 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select/base.py @@ -4,14 +4,14 @@ from django.forms.fields import ChoiceField from django.forms.widgets import Select from django.utils.translation import gettext_lazy as _ -from . import UID -from .forms import SelectInputForm -from .settings import SUBMIT_VALUE_AS - from fobi.base import FormFieldPlugin, get_theme from fobi.constants import SUBMIT_VALUE_AS_REPR, SUBMIT_VALUE_AS_VAL from fobi.helpers import get_select_field_choices, safe_text +from . import UID +from .forms import SelectInputForm +from .settings import SUBMIT_VALUE_AS + __title__ = "fobi.contrib.plugins.form_elements.fields.select.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/select/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/select/fobi_form_elements.py index 4507ec9b..3647c677 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import SelectInputPlugin - from fobi.base import form_element_plugin_registry +from .base import SelectInputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "select.fobi_form_elements" ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/select/settings.py b/src/fobi/contrib/plugins/form_elements/fields/select/settings.py index b339dc67..6430fad7 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select/settings.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select/settings.py @@ -1,7 +1,7 @@ -from .conf import get_setting - from fobi.helpers import validate_submit_value_as +from .conf import get_setting + __title__ = "fobi.contrib.plugins.form_elements.fields.select.settings" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_model_object/base.py b/src/fobi/contrib/plugins/form_elements/fields/select_model_object/base.py index 676c4c04..bf12d42e 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select_model_object/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select_model_object/base.py @@ -5,10 +5,6 @@ from django.forms.models import ModelChoiceField from django.forms.widgets import Select from django.utils.translation import gettext_lazy as _ -from . import UID -from .forms import SelectModelObjectInputForm -from .settings import SUBMIT_VALUE_AS - from fobi.base import FormFieldPlugin, get_theme from fobi.constants import SUBMIT_VALUE_AS_REPR, SUBMIT_VALUE_AS_VAL from fobi.helpers import ( @@ -17,6 +13,10 @@ from fobi.helpers import ( safe_text, ) +from . import UID +from .forms import SelectModelObjectInputForm +from .settings import SUBMIT_VALUE_AS + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "select_model_object.base" ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_model_object/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/select_model_object/fobi_form_elements.py index 53a88bbe..42339c7b 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select_model_object/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select_model_object/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import SelectModelObjectInputPlugin - from fobi.base import form_element_plugin_registry +from .base import SelectModelObjectInputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "select_model_object.fobi_form_elements" diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_model_object/forms.py b/src/fobi/contrib/plugins/form_elements/fields/select_model_object/forms.py index d57a9e1f..6121f2d8 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select_model_object/forms.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select_model_object/forms.py @@ -1,11 +1,11 @@ from django import forms from django.utils.translation import gettext_lazy as _ -from .settings import IGNORED_MODELS - from fobi.base import BaseFormFieldPluginForm, get_theme from fobi.helpers import get_registered_models +from .settings import IGNORED_MODELS + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "select_model_object.forms" ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_model_object/settings.py b/src/fobi/contrib/plugins/form_elements/fields/select_model_object/settings.py index 53ed5c0b..6780d168 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select_model_object/settings.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select_model_object/settings.py @@ -1,7 +1,7 @@ -from .conf import get_setting - from fobi.helpers import validate_submit_value_as +from .conf import get_setting + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "select_model_object.settings" ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_mptt_model_object/base.py b/src/fobi/contrib/plugins/form_elements/fields/select_mptt_model_object/base.py index 16854ff7..47e6efae 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select_mptt_model_object/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select_mptt_model_object/base.py @@ -5,10 +5,6 @@ from django.forms.widgets import Select from django.utils.translation import gettext_lazy as _ from mptt.fields import TreeNodeChoiceField -from . import UID -from .forms import SelectMPTTModelObjectInputForm -from .settings import SUBMIT_VALUE_AS - from fobi.base import FormFieldPlugin, get_theme from fobi.constants import SUBMIT_VALUE_AS_REPR, SUBMIT_VALUE_AS_VAL from fobi.helpers import ( @@ -17,6 +13,10 @@ from fobi.helpers import ( safe_text, ) +from . import UID +from .forms import SelectMPTTModelObjectInputForm +from .settings import SUBMIT_VALUE_AS + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "select_mptt_model_object.base" ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_mptt_model_object/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/select_mptt_model_object/fobi_form_elements.py index 1799e3a1..da987b60 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select_mptt_model_object/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select_mptt_model_object/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import SelectMPTTModelObjectInputPlugin - from fobi.base import form_element_plugin_registry +from .base import SelectMPTTModelObjectInputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "select_mptt_model_object.fobi_form_elements" diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_mptt_model_object/forms.py b/src/fobi/contrib/plugins/form_elements/fields/select_mptt_model_object/forms.py index 5fed5ab7..86bc0d39 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select_mptt_model_object/forms.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select_mptt_model_object/forms.py @@ -1,11 +1,11 @@ from django import forms from django.utils.translation import gettext_lazy as _ -from .settings import IGNORED_MODELS - from fobi.base import BaseFormFieldPluginForm, get_theme from fobi.helpers import get_registered_models +from .settings import IGNORED_MODELS + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "select_mptt_model_object.forms" diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_mptt_model_object/settings.py b/src/fobi/contrib/plugins/form_elements/fields/select_mptt_model_object/settings.py index 47d6bd87..f61d583c 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select_mptt_model_object/settings.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select_mptt_model_object/settings.py @@ -1,7 +1,7 @@ -from .conf import get_setting - from fobi.helpers import validate_submit_value_as +from .conf import get_setting + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "select_mptt_model_object.settings" diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_multiple/base.py b/src/fobi/contrib/plugins/form_elements/fields/select_multiple/base.py index cdddaeb0..f86c1e04 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select_multiple/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select_multiple/base.py @@ -4,14 +4,14 @@ from django.forms.fields import MultipleChoiceField from django.forms.widgets import SelectMultiple from django.utils.translation import gettext_lazy as _ -from . import UID -from .forms import SelectMultipleInputForm -from .settings import SUBMIT_VALUE_AS - from fobi.base import FormFieldPlugin, get_theme from fobi.constants import SUBMIT_VALUE_AS_REPR, SUBMIT_VALUE_AS_VAL from fobi.helpers import get_select_field_choices, safe_text +from . import UID +from .forms import SelectMultipleInputForm +from .settings import SUBMIT_VALUE_AS + __title__ = "fobi.contrib.plugins.form_elements.fields." "select_multiple.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_multiple/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/select_multiple/fobi_form_elements.py index dd71f9d7..16bc6323 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select_multiple/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select_multiple/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import SelectMultipleInputPlugin - from fobi.base import form_element_plugin_registry +from .base import SelectMultipleInputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "select_multiple.fobi_form_elements" diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_multiple/settings.py b/src/fobi/contrib/plugins/form_elements/fields/select_multiple/settings.py index 22106b95..c814f746 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select_multiple/settings.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select_multiple/settings.py @@ -1,7 +1,7 @@ -from .conf import get_setting - from fobi.helpers import validate_submit_value_as +from .conf import get_setting + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "select_multiple.settings" ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/base.py b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/base.py index 17548946..abfc230e 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/base.py @@ -8,10 +8,6 @@ from django.forms.models import ModelMultipleChoiceField from django.forms.widgets import SelectMultiple from django.utils.translation import gettext_lazy as _ -from . import UID -from .forms import SelectMultipleModelObjectsInputForm -from .settings import SUBMIT_VALUE_AS - from fobi.base import FormFieldPlugin, get_theme from fobi.constants import SUBMIT_VALUE_AS_REPR, SUBMIT_VALUE_AS_VAL from fobi.helpers import ( @@ -20,6 +16,10 @@ from fobi.helpers import ( safe_text, ) +from . import UID +from .forms import SelectMultipleModelObjectsInputForm +from .settings import SUBMIT_VALUE_AS + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "select_multiple_model_objects.fobi_form_elements" diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/fobi_form_elements.py index 74b26cdf..0200f739 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import SelectMultipleModelObjectsInputPlugin - from fobi.base import form_element_plugin_registry +from .base import SelectMultipleModelObjectsInputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "select_multiple_model_objects.fobi_form_elements" diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py index c4c81015..4486c97d 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/forms.py @@ -1,11 +1,11 @@ from django import forms from django.utils.translation import gettext_lazy as _ -from .settings import IGNORED_MODELS - from fobi.base import BaseFormFieldPluginForm, get_theme from fobi.helpers import get_registered_models +from .settings import IGNORED_MODELS + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "select_multiple_model_objects.forms" diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/settings.py b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/settings.py index 9cf6cc41..90038258 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/settings.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_model_objects/settings.py @@ -1,7 +1,7 @@ -from .conf import get_setting - from fobi.helpers import validate_submit_value_as +from .conf import get_setting + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "select_multiple_model_objects.settings" diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_mptt_model_objects/base.py b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_mptt_model_objects/base.py index d6d0607a..5a0dbec8 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_mptt_model_objects/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_mptt_model_objects/base.py @@ -8,10 +8,6 @@ from django.forms.widgets import SelectMultiple from django.utils.translation import gettext_lazy as _ from mptt.fields import TreeNodeMultipleChoiceField -from . import UID -from .forms import SelectMultipleMPTTModelObjectsInputForm -from .settings import SUBMIT_VALUE_AS - from fobi.base import FormFieldPlugin, get_theme from fobi.constants import SUBMIT_VALUE_AS_REPR, SUBMIT_VALUE_AS_VAL from fobi.helpers import ( @@ -20,6 +16,10 @@ from fobi.helpers import ( safe_text, ) +from . import UID +from .forms import SelectMultipleMPTTModelObjectsInputForm +from .settings import SUBMIT_VALUE_AS + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "select_multiple_mptt_model_objects.base" diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_mptt_model_objects/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_mptt_model_objects/fobi_form_elements.py index 48a956d5..28462ad3 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_mptt_model_objects/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_mptt_model_objects/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import SelectMultipleMPTTModelObjectsInputPlugin - from fobi.base import form_element_plugin_registry +from .base import SelectMultipleMPTTModelObjectsInputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "select_multiple_mptt_model_objects.fobi_form_elements" diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_mptt_model_objects/forms.py b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_mptt_model_objects/forms.py index 462d93c3..f40ae539 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_mptt_model_objects/forms.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_mptt_model_objects/forms.py @@ -1,11 +1,11 @@ from django import forms from django.utils.translation import gettext_lazy as _ -from .settings import IGNORED_MODELS - from fobi.base import BaseFormFieldPluginForm, get_theme from fobi.helpers import get_registered_models +from .settings import IGNORED_MODELS + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "select_multiple_mptt_model_objects.forms" diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_mptt_model_objects/settings.py b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_mptt_model_objects/settings.py index 61f094a5..67f1c585 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_mptt_model_objects/settings.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_mptt_model_objects/settings.py @@ -1,7 +1,7 @@ -from .conf import get_setting - from fobi.helpers import validate_submit_value_as +from .conf import get_setting + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "select_multiple_mptt_model_objects.settings" diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_with_max/base.py b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_with_max/base.py index df0cd5f5..0acf3991 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_with_max/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_with_max/base.py @@ -3,15 +3,15 @@ from __future__ import absolute_import from django.forms.widgets import SelectMultiple from django.utils.translation import gettext_lazy as _ +from fobi.base import FormFieldPlugin, get_theme +from fobi.constants import SUBMIT_VALUE_AS_REPR, SUBMIT_VALUE_AS_VAL +from fobi.helpers import get_select_field_choices, safe_text + from . import UID from .fields import MultipleChoiceWithMaxField from .forms import SelectMultipleWithMaxInputForm from .settings import SUBMIT_VALUE_AS -from fobi.base import FormFieldPlugin, get_theme -from fobi.constants import SUBMIT_VALUE_AS_REPR, SUBMIT_VALUE_AS_VAL -from fobi.helpers import get_select_field_choices, safe_text - __title__ = ( "fobi.contrib.plugins.form_elements.fields." "select_multiple_with_max.base" ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_with_max/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_with_max/fobi_form_elements.py index 0cc3e49b..e80957f4 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_with_max/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_with_max/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import SelectMultipleWithMaxInputPlugin - from fobi.base import form_element_plugin_registry +from .base import SelectMultipleWithMaxInputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "select_multiple_with_max.fobi_form_elements" diff --git a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_with_max/settings.py b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_with_max/settings.py index 1f007c20..b87b0026 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/select_multiple_with_max/settings.py +++ b/src/fobi/contrib/plugins/form_elements/fields/select_multiple_with_max/settings.py @@ -1,7 +1,7 @@ -from .conf import get_setting - from fobi.helpers import validate_submit_value_as +from .conf import get_setting + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "select_multiple_with_max.settings" diff --git a/src/fobi/contrib/plugins/form_elements/fields/slider/base.py b/src/fobi/contrib/plugins/form_elements/fields/slider/base.py index 4baf8efa..0275359a 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/slider/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/slider/base.py @@ -7,6 +7,10 @@ from django.utils.safestring import mark_safe from django.utils.translation import gettext_lazy as _ from six import PY3, text_type +from fobi.base import FormFieldPlugin, get_theme +from fobi.helpers import get_select_field_choices +from fobi.widgets import RichSelectInverseQuotes + from . import UID from .constants import ( SLIDER_DEFAULT_HANDLE, @@ -24,10 +28,6 @@ from .settings import ( # MAX_VALUE,; MIN_VALUE, STEP, ) -from fobi.base import FormFieldPlugin, get_theme -from fobi.helpers import get_select_field_choices -from fobi.widgets import RichSelectInverseQuotes - __title__ = "fobi.contrib.plugins.form_elements.fields.slider.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/slider/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/slider/fobi_form_elements.py index 41e99430..db95d93e 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/slider/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/slider/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import SliderInputPlugin - from fobi.base import form_element_plugin_registry +from .base import SliderInputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields.slider." "fobi_form_elements" ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/slider/forms.py b/src/fobi/contrib/plugins/form_elements/fields/slider/forms.py index 1cbb3766..e01fd072 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/slider/forms.py +++ b/src/fobi/contrib/plugins/form_elements/fields/slider/forms.py @@ -1,6 +1,10 @@ from django import forms from django.utils.translation import gettext_lazy as _ +from fobi.base import BaseFormFieldPluginForm, get_theme +from fobi.helpers import get_select_field_choices +from fobi.widgets import NumberInput + from .constants import ( SLIDER_DEFAULT_HANDLE, SLIDER_DEFAULT_SHOW_ENDPOINTS_AS, @@ -22,10 +26,6 @@ from .settings import ( STEP, ) -from fobi.base import BaseFormFieldPluginForm, get_theme -from fobi.helpers import get_select_field_choices -from fobi.widgets import NumberInput - __title__ = "fobi.contrib.plugins.form_elements.fields.slider.forms" __author__ = "Artur Barseghyan " __copyright__ = "2014-2015 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/slider/widgets.py b/src/fobi/contrib/plugins/form_elements/fields/slider/widgets.py index 0e67fa10..07e6590b 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/slider/widgets.py +++ b/src/fobi/contrib/plugins/form_elements/fields/slider/widgets.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from . import UID - from fobi.base import FormElementPluginWidget +from . import UID + __title__ = "fobi.contrib.plugins.form_elements.fields.slider.widgets" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/slug/base.py b/src/fobi/contrib/plugins/form_elements/fields/slug/base.py index cfd0c331..61c90aed 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/slug/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/slug/base.py @@ -4,11 +4,11 @@ from django.forms.fields import SlugField from django.forms.widgets import TextInput from django.utils.translation import gettext_lazy as _ +from fobi.base import FormFieldPlugin, get_theme + from . import UID from .forms import SlugInputForm -from fobi.base import FormFieldPlugin, get_theme - __title__ = "fobi.contrib.plugins.form_elements.fields.slug.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/slug/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/slug/fobi_form_elements.py index 79a6e829..69c84eaa 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/slug/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/slug/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import SlugInputPlugin - from fobi.base import form_element_plugin_registry +from .base import SlugInputPlugin + __title__ = "fobi.contrib.plugins.form_elements.fields.slug.fobi_form_elements" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/text/base.py b/src/fobi/contrib/plugins/form_elements/fields/text/base.py index a80a9308..224269b4 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/text/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/text/base.py @@ -4,11 +4,11 @@ from django.forms.fields import CharField from django.forms.widgets import TextInput from django.utils.translation import gettext_lazy as _ +from fobi.base import FormFieldPlugin, get_theme + from . import UID from .forms import TextInputForm -from fobi.base import FormFieldPlugin, get_theme - __title__ = "fobi.contrib.plugins.form_elements.fields.text.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/text/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/text/fobi_form_elements.py index ae36533f..5a7eabb0 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/text/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/text/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import TextInputPlugin - from fobi.base import form_element_plugin_registry +from .base import TextInputPlugin + __title__ = "fobi.contrib.plugins.form_elements.fields.text.fobi_form_elements" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/textarea/base.py b/src/fobi/contrib/plugins/form_elements/fields/textarea/base.py index 1e34eaaa..81aa99ab 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/textarea/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/textarea/base.py @@ -4,11 +4,11 @@ from django.forms.fields import CharField from django.forms.widgets import Textarea from django.utils.translation import gettext_lazy as _ +from fobi.base import FormFieldPlugin, get_theme + from . import UID from .forms import TextareaForm -from fobi.base import FormFieldPlugin, get_theme - __title__ = "fobi.contrib.plugins.form_elements.fields.textarea.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/textarea/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/textarea/fobi_form_elements.py index 5bbdad4b..4d75e3dd 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/textarea/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/textarea/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import TextareaPlugin - from fobi.base import form_element_plugin_registry +from .base import TextareaPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "textarea.fobi_form_elements" ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/time/base.py b/src/fobi/contrib/plugins/form_elements/fields/time/base.py index 493b528b..14aaaf5c 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/time/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/time/base.py @@ -4,11 +4,11 @@ from django.forms.fields import TimeField from django.forms.widgets import TextInput from django.utils.translation import gettext_lazy as _ +from fobi.base import FormFieldPlugin, get_theme + from . import UID from .forms import TimeInputForm -from fobi.base import FormFieldPlugin, get_theme - __title__ = "fobi.contrib.plugins.form_elements.fields.time.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/time/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/time/fobi_form_elements.py index 150bb1d2..4fb53758 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/time/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/time/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import TimeInputPlugin - from fobi.base import form_element_plugin_registry +from .base import TimeInputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.fields." "time.fobi_form_elements" ) diff --git a/src/fobi/contrib/plugins/form_elements/fields/url/base.py b/src/fobi/contrib/plugins/form_elements/fields/url/base.py index 87089490..805c671c 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/url/base.py +++ b/src/fobi/contrib/plugins/form_elements/fields/url/base.py @@ -15,11 +15,11 @@ except ImportError: from django.utils.translation import gettext_lazy as _ +from fobi.base import FormFieldPlugin, get_theme + from . import UID from .forms import URLInputForm -from fobi.base import FormFieldPlugin, get_theme - __title__ = "fobi.contrib.plugins.form_elements.fields.url.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/fields/url/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/fields/url/fobi_form_elements.py index 86252ab4..2b78a2a8 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/url/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/fields/url/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import URLInputPlugin - from fobi.base import form_element_plugin_registry +from .base import URLInputPlugin + __title__ = "fobi.contrib.plugins.form_elements.fields.url.fobi_form_elements" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/security/captcha/base.py b/src/fobi/contrib/plugins/form_elements/security/captcha/base.py index 30de4f4c..16a31698 100644 --- a/src/fobi/contrib/plugins/form_elements/security/captcha/base.py +++ b/src/fobi/contrib/plugins/form_elements/security/captcha/base.py @@ -4,12 +4,12 @@ import logging from django.utils.translation import gettext_lazy as _ +from fobi.base import FormElementPlugin, get_theme + from ......pip_helpers import check_if_installed, get_installed_packages from . import UID from .forms import CaptchaInputForm -from fobi.base import FormElementPlugin, get_theme - logger = logging.getLogger(__name__) DJANGO_RECAPTCHA_INSTALLED = False diff --git a/src/fobi/contrib/plugins/form_elements/security/captcha/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/security/captcha/fobi_form_elements.py index 7946cbe6..6e7c1bb9 100644 --- a/src/fobi/contrib/plugins/form_elements/security/captcha/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/security/captcha/fobi_form_elements.py @@ -1,13 +1,13 @@ from __future__ import absolute_import +from fobi.base import form_element_plugin_registry + from .base import ( DJANGO_RECAPTCHA_INSTALLED, DJANGO_SIMPLE_CAPTCHA_INSTALLED, CaptchaInputPlugin, ) -from fobi.base import form_element_plugin_registry - __title__ = ( "fobi.contrib.plugins.form_elements.security." "captcha.fobi_form_elements" ) diff --git a/src/fobi/contrib/plugins/form_elements/security/honeypot/base.py b/src/fobi/contrib/plugins/form_elements/security/honeypot/base.py index ca2eeacd..34a8b77d 100644 --- a/src/fobi/contrib/plugins/form_elements/security/honeypot/base.py +++ b/src/fobi/contrib/plugins/form_elements/security/honeypot/base.py @@ -3,12 +3,12 @@ from __future__ import absolute_import from django.forms.widgets import HiddenInput from django.utils.translation import gettext_lazy as _ +from fobi.base import FormElementPlugin, get_theme + from . import UID from .fields import HoneypotField from .forms import HoneypotInputForm -from fobi.base import FormElementPlugin, get_theme - __title__ = "fobi.contrib.plugins.form_elements.security.honeypot.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/security/honeypot/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/security/honeypot/fobi_form_elements.py index d1578748..785ab40f 100644 --- a/src/fobi/contrib/plugins/form_elements/security/honeypot/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/security/honeypot/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import HoneypotInputPlugin - from fobi.base import form_element_plugin_registry +from .base import HoneypotInputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.security." "honeypot.fobi_form_elements" ) diff --git a/src/fobi/contrib/plugins/form_elements/security/invisible_recaptcha/base.py b/src/fobi/contrib/plugins/form_elements/security/invisible_recaptcha/base.py index 1e0a3be1..21578104 100644 --- a/src/fobi/contrib/plugins/form_elements/security/invisible_recaptcha/base.py +++ b/src/fobi/contrib/plugins/form_elements/security/invisible_recaptcha/base.py @@ -2,14 +2,14 @@ from __future__ import absolute_import from django.utils.translation import gettext_lazy as _ +from fobi.base import FormElementPlugin, get_theme + from . import UID from .constants import RECAPTCHA_FIELD from .fields import InvisibleRecaptchaField from .forms import InvisibleRecaptchaInputForm from .widgets import InvisibleRecaptchaWidget -from fobi.base import FormElementPlugin, get_theme - __title__ = ( "fobi.contrib.plugins.form_elements.security." "invisible_recaptcha.base" ) diff --git a/src/fobi/contrib/plugins/form_elements/security/invisible_recaptcha/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/security/invisible_recaptcha/fobi_form_elements.py index a439eca2..fb67e9ba 100644 --- a/src/fobi/contrib/plugins/form_elements/security/invisible_recaptcha/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/security/invisible_recaptcha/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import InvisibleRecaptchaInputPlugin - from fobi.base import form_element_plugin_registry +from .base import InvisibleRecaptchaInputPlugin + __title__ = ( "fobi.contrib.plugins.form_elements.security." "invisible_recaptcha.fobi_form_elements" diff --git a/src/fobi/contrib/plugins/form_elements/security/invisible_recaptcha/widgets.py b/src/fobi/contrib/plugins/form_elements/security/invisible_recaptcha/widgets.py index 27c37bd2..a7bbe93d 100644 --- a/src/fobi/contrib/plugins/form_elements/security/invisible_recaptcha/widgets.py +++ b/src/fobi/contrib/plugins/form_elements/security/invisible_recaptcha/widgets.py @@ -1,10 +1,10 @@ from django.forms.widgets import HiddenInput +from fobi.base import FormElementPluginWidget + from . import UID from .conf import get_setting -from fobi.base import FormElementPluginWidget - __title__ = ( "fobi.contrib.plugins.form_elements.security." "invisible_recaptcha.widgets" ) diff --git a/src/fobi/contrib/plugins/form_elements/security/recaptcha/base.py b/src/fobi/contrib/plugins/form_elements/security/recaptcha/base.py index 716106fa..ed4b6b99 100644 --- a/src/fobi/contrib/plugins/form_elements/security/recaptcha/base.py +++ b/src/fobi/contrib/plugins/form_elements/security/recaptcha/base.py @@ -5,12 +5,12 @@ import logging from django.conf import settings from django.utils.translation import gettext_lazy as _ +from fobi.base import FormElementPlugin, get_theme + from ......pip_helpers import check_if_installed, get_installed_packages from . import UID from .forms import ReCaptchaInputForm -from fobi.base import FormElementPlugin, get_theme - logger = logging.getLogger(__name__) DJANGO_RECAPTCHA_INSTALLED = False diff --git a/src/fobi/contrib/plugins/form_elements/security/recaptcha/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/security/recaptcha/fobi_form_elements.py index 46bffcec..7ad2a4c4 100644 --- a/src/fobi/contrib/plugins/form_elements/security/recaptcha/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/security/recaptcha/fobi_form_elements.py @@ -1,13 +1,13 @@ from __future__ import absolute_import +from fobi.base import form_element_plugin_registry + from .base import ( DJANGO_RECAPTCHA_INSTALLED, DJANGO_SIMPLE_CAPTCHA_INSTALLED, ReCaptchaInputPlugin, ) -from fobi.base import form_element_plugin_registry - __title__ = ( "fobi.contrib.plugins.form_elements.security." "recaptcha.fobi_form_elements" diff --git a/src/fobi/contrib/plugins/form_elements/test/dummy/base.py b/src/fobi/contrib/plugins/form_elements/test/dummy/base.py index a602331e..5e5802fb 100644 --- a/src/fobi/contrib/plugins/form_elements/test/dummy/base.py +++ b/src/fobi/contrib/plugins/form_elements/test/dummy/base.py @@ -5,11 +5,11 @@ from uuid import uuid4 from django.utils.translation import gettext, gettext_lazy as _ from nonefield.fields import NoneField -from . import UID - from fobi.base import FormElementPlugin from fobi.helpers import safe_text +from . import UID + __title__ = "fobi.contrib.plugins.form_elements.test.dummy.base" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/test/dummy/fobi_form_elements.py b/src/fobi/contrib/plugins/form_elements/test/dummy/fobi_form_elements.py index e0554d23..4e970127 100644 --- a/src/fobi/contrib/plugins/form_elements/test/dummy/fobi_form_elements.py +++ b/src/fobi/contrib/plugins/form_elements/test/dummy/fobi_form_elements.py @@ -1,9 +1,9 @@ from __future__ import absolute_import -from .base import DummyPlugin - from fobi.base import form_element_plugin_registry +from .base import DummyPlugin + __title__ = "fobi.contrib.plugins.form_elements.test.dummy.fobi_form_elements" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_elements/test/dummy/widgets.py b/src/fobi/contrib/plugins/form_elements/test/dummy/widgets.py index d480a27c..42842c60 100644 --- a/src/fobi/contrib/plugins/form_elements/test/dummy/widgets.py +++ b/src/fobi/contrib/plugins/form_elements/test/dummy/widgets.py @@ -1,7 +1,7 @@ -from . import UID - from fobi.base import FormElementPluginWidget +from . import UID + __title__ = "fobi.contrib.plugins.form_elements.test.dummy.widgets" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_handlers/db_store/base.py b/src/fobi/contrib/plugins/form_handlers/db_store/base.py index ec3fc4cb..7b4a67da 100644 --- a/src/fobi/contrib/plugins/form_handlers/db_store/base.py +++ b/src/fobi/contrib/plugins/form_handlers/db_store/base.py @@ -57,9 +57,12 @@ class DBStoreHandlerPlugin(FormHandlerPlugin): form, form_element_entries ) - return (True, self.save_form_data_entry( - form_entry, request, field_name_to_label_map, cleaned_data - )) + return ( + True, + self.save_form_data_entry( + form_entry, request, field_name_to_label_map, cleaned_data + ), + ) def save_form_data_entry( self, form_entry, request, field_name_to_label_map, cleaned_data diff --git a/src/fobi/contrib/plugins/form_handlers/db_store/callbacks.py b/src/fobi/contrib/plugins/form_handlers/db_store/callbacks.py index eb6ae4a7..f22405e0 100644 --- a/src/fobi/contrib/plugins/form_handlers/db_store/callbacks.py +++ b/src/fobi/contrib/plugins/form_handlers/db_store/callbacks.py @@ -3,11 +3,11 @@ import json from django.core.serializers.json import DjangoJSONEncoder -from .models import SavedFormDataEntry - from fobi.base import FormCallback, get_processed_form_data from fobi.constants import CALLBACK_FORM_VALID +from .models import SavedFormDataEntry + __title__ = "fobi.contrib.plugins.form_handlers.db_store.callbacks" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/plugins/form_handlers/db_store/migrations/0001_initial.py b/src/fobi/contrib/plugins/form_handlers/db_store/migrations/0001_initial.py index 9c3aa159..4f81d31f 100644 --- a/src/fobi/contrib/plugins/form_handlers/db_store/migrations/0001_initial.py +++ b/src/fobi/contrib/plugins/form_handlers/db_store/migrations/0001_initial.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import migrations, models from django.conf import settings +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/src/fobi/contrib/plugins/form_handlers/db_store/migrations/0002_savedformwizarddataentry.py b/src/fobi/contrib/plugins/form_handlers/db_store/migrations/0002_savedformwizarddataentry.py index aa260cb2..d6df8383 100644 --- a/src/fobi/contrib/plugins/form_handlers/db_store/migrations/0002_savedformwizarddataentry.py +++ b/src/fobi/contrib/plugins/form_handlers/db_store/migrations/0002_savedformwizarddataentry.py @@ -2,9 +2,9 @@ # Generated by Django 1.9.9 on 2016-10-15 23:35 from __future__ import unicode_literals +import django.db.models.deletion from django.conf import settings from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration): diff --git a/src/fobi/contrib/themes/bootstrap3/fobi_themes.py b/src/fobi/contrib/themes/bootstrap3/fobi_themes.py index d6d315b9..8689688e 100644 --- a/src/fobi/contrib/themes/bootstrap3/fobi_themes.py +++ b/src/fobi/contrib/themes/bootstrap3/fobi_themes.py @@ -1,9 +1,9 @@ from django.utils.translation import gettext_lazy as _ -from . import UID - from fobi.base import BaseTheme, theme_registry +from . import UID + __title__ = "fobi.contrib.themes.bootstrap3.fobi_themes" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/themes/djangocms_admin_style_theme/fobi_themes.py b/src/fobi/contrib/themes/djangocms_admin_style_theme/fobi_themes.py index b286d8f2..f37a7fb4 100644 --- a/src/fobi/contrib/themes/djangocms_admin_style_theme/fobi_themes.py +++ b/src/fobi/contrib/themes/djangocms_admin_style_theme/fobi_themes.py @@ -1,9 +1,9 @@ from django.utils.translation import gettext_lazy as _ -from . import UID - from fobi.base import BaseTheme, theme_registry +from . import UID + __title__ = "fobi.contrib.themes.djangocms_admin_style_theme.fobi_themes" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/contrib/themes/foundation5/fobi_themes.py b/src/fobi/contrib/themes/foundation5/fobi_themes.py index aa61b272..2e8ba78a 100644 --- a/src/fobi/contrib/themes/foundation5/fobi_themes.py +++ b/src/fobi/contrib/themes/foundation5/fobi_themes.py @@ -1,9 +1,9 @@ from django.utils.translation import gettext_lazy as _ -from . import UID - from fobi.base import BaseTheme, theme_registry +from . import UID + __title__ = "fobi.contrib.themes.foundation5.fobi_themes" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/discover.py b/src/fobi/discover.py index dfd4c4c5..15bb671b 100644 --- a/src/fobi/discover.py +++ b/src/fobi/discover.py @@ -3,6 +3,7 @@ import logging import sys import six + # from django.conf import settings from django.utils.module_loading import autodiscover_modules diff --git a/src/fobi/helpers.py b/src/fobi/helpers.py index 15e07b61..7ace2fe1 100644 --- a/src/fobi/helpers.py +++ b/src/fobi/helpers.py @@ -16,8 +16,10 @@ from autoslug.settings import slugify from django import forms from django.conf import settings from django.contrib.auth.models import AnonymousUser, User + # from django.contrib.contenttypes.models import ContentType from django.core.files.base import File + # from django.db.utils import DatabaseError from django.http import HttpResponse from django.templatetags.static import static diff --git a/src/fobi/migrations/0001_initial.py b/src/fobi/migrations/0001_initial.py index bbb1c263..03db76b3 100644 --- a/src/fobi/migrations/0001_initial.py +++ b/src/fobi/migrations/0001_initial.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations import autoslug.fields from django.conf import settings +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/src/fobi/migrations/0002_auto_20150912_1744.py b/src/fobi/migrations/0002_auto_20150912_1744.py index 12703917..d3bdf44e 100644 --- a/src/fobi/migrations/0002_auto_20150912_1744.py +++ b/src/fobi/migrations/0002_auto_20150912_1744.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/src/fobi/migrations/0003_auto_20160517_1005.py b/src/fobi/migrations/0003_auto_20160517_1005.py index 84d4745f..f32bce77 100644 --- a/src/fobi/migrations/0003_auto_20160517_1005.py +++ b/src/fobi/migrations/0003_auto_20160517_1005.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import migrations, models import autoslug.fields +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/src/fobi/migrations/0004_auto_20160906_1513.py b/src/fobi/migrations/0004_auto_20160906_1513.py index b908e541..abf27415 100644 --- a/src/fobi/migrations/0004_auto_20160906_1513.py +++ b/src/fobi/migrations/0004_auto_20160906_1513.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/src/fobi/migrations/0007_auto_20160926_1652.py b/src/fobi/migrations/0007_auto_20160926_1652.py index 0dd15939..58aca230 100644 --- a/src/fobi/migrations/0007_auto_20160926_1652.py +++ b/src/fobi/migrations/0007_auto_20160926_1652.py @@ -2,8 +2,8 @@ # Generated by Django 1.9.9 on 2016-09-26 21:52 from __future__ import unicode_literals -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/src/fobi/migrations/0008_formwizardhandlerentry.py b/src/fobi/migrations/0008_formwizardhandlerentry.py index ede3d4fd..a64b3465 100644 --- a/src/fobi/migrations/0008_formwizardhandlerentry.py +++ b/src/fobi/migrations/0008_formwizardhandlerentry.py @@ -2,8 +2,8 @@ # Generated by Django 1.9.9 on 2016-09-27 22:56 from __future__ import unicode_literals -from django.db import migrations, models import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/src/fobi/reusable/email_repeat/field.py b/src/fobi/reusable/email_repeat/field.py index e18cba4b..ee97244f 100644 --- a/src/fobi/reusable/email_repeat/field.py +++ b/src/fobi/reusable/email_repeat/field.py @@ -51,6 +51,7 @@ class EmailRepeatField(forms.MultiValueField): """ + widget = EmailRepeatWidget def __init__(self, *args, **kwargs): @@ -62,8 +63,11 @@ class EmailRepeatField(forms.MultiValueField): def compress(self, data_list): if data_list: - email1, email2 = data_list - if email1 != email2: - raise ValidationError(_("Emails must match")) - return email1 + return data_list[0] return None + + def clean(self, value): + super().clean(value) + if value[0] != value[1]: + raise ValidationError(_("Emails must match."), code="invalid") + return value[0] diff --git a/src/fobi/reusable/email_repeat/widget.py b/src/fobi/reusable/email_repeat/widget.py index 734d7d4f..baf396b0 100644 --- a/src/fobi/reusable/email_repeat/widget.py +++ b/src/fobi/reusable/email_repeat/widget.py @@ -21,8 +21,3 @@ class EmailRepeatWidget(forms.MultiWidget): if value: return [value, value] return ["", ""] - - def value_from_datadict(self, data, files, name): - email1 = data.get(f"{name}_0") - email2 = data.get(f"{name}_1") - return email1, email2 diff --git a/src/fobi/tests/base.py b/src/fobi/tests/base.py index 229d3a29..ea16dc8b 100644 --- a/src/fobi/tests/base.py +++ b/src/fobi/tests/base.py @@ -7,8 +7,8 @@ from django.contrib.staticfiles.testing import StaticLiveServerTestCase from django.core.management import call_command from django.urls import reverse from selenium import webdriver -from selenium.webdriver.common.by import By from selenium.webdriver.common.action_chains import ActionChains +from selenium.webdriver.common.by import By from selenium.webdriver.common.keys import Keys from selenium.webdriver.firefox.firefox_binary import FirefoxBinary from selenium.webdriver.support.wait import WebDriverWait @@ -154,8 +154,7 @@ class BaseFobiBrowserBuldDynamicFormsTest(StaticLiveServerTestCase): WebDriverWait(self.driver, timeout=TIMEOUT).until( # lambda driver: driver.find_element(By.ID, 'id_main') lambda driver: driver.find_element( - By.XPATH, - '//body[contains(@class, "theme")]' + By.XPATH, '//body[contains(@class, "theme")]' ) ) diff --git a/src/fobi/tests/data.py b/src/fobi/tests/data.py index f731814d..20aa4590 100644 --- a/src/fobi/tests/data.py +++ b/src/fobi/tests/data.py @@ -22,6 +22,7 @@ from fobi.contrib.plugins.form_elements.fields.checkbox_select_multiple.fobi_for from fobi.contrib.plugins.form_elements.fields.date.fobi_form_elements import ( DateInputPlugin, ) + # from fobi.contrib.plugins.form_elements.fields \ # .date_drop_down.fobi_form_elements import DateDropDownInputPlugin from fobi.contrib.plugins.form_elements.fields.datetime.fobi_form_elements import ( @@ -42,6 +43,7 @@ from fobi.contrib.plugins.form_elements.fields.float.fobi_form_elements import ( from fobi.contrib.plugins.form_elements.fields.hidden.fobi_form_elements import ( HiddenInputPlugin, ) + # from fobi.contrib.plugins.form_elements.fields.hidden_model_object \ # .fobi_form_elements import HiddenModelObjectInputPlugin from fobi.contrib.plugins.form_elements.fields.integer.fobi_form_elements import ( diff --git a/src/fobi/tests/helpers.py b/src/fobi/tests/helpers.py index db47c43a..cf78077a 100644 --- a/src/fobi/tests/helpers.py +++ b/src/fobi/tests/helpers.py @@ -7,14 +7,6 @@ from django.contrib.auth import get_user_model from django.core.exceptions import ObjectDoesNotExist from django.core.management import call_command -from .constants import ( - FOBI_TEST_USER_PASSWORD, - FOBI_TEST_USER_USERNAME, - TEST_FORM_NAME, - TEST_FORM_SLUG, -) -from .core import is_app_setup_completed, mark_app_setup_as_completed - from fobi.contrib.plugins.form_elements.content.content_image.fobi_form_elements import ( ContentImagePlugin, ) @@ -47,6 +39,14 @@ from fobi.contrib.plugins.form_handlers.mail.fobi_form_handlers import ( ) from fobi.models import FormElementEntry, FormEntry, FormHandlerEntry +from .constants import ( + FOBI_TEST_USER_PASSWORD, + FOBI_TEST_USER_USERNAME, + TEST_FORM_NAME, + TEST_FORM_SLUG, +) +from .core import is_app_setup_completed, mark_app_setup_as_completed + __title__ = "fobi.tests.helpers" __author__ = "Artur Barseghyan " __copyright__ = "2014-2019 Artur Barseghyan" diff --git a/src/fobi/tests/test_browser_build_dynamic_forms.py b/src/fobi/tests/test_browser_build_dynamic_forms.py index b33ab24d..65b9c5f4 100644 --- a/src/fobi/tests/test_browser_build_dynamic_forms.py +++ b/src/fobi/tests/test_browser_build_dynamic_forms.py @@ -1,7 +1,7 @@ import logging -from django.urls import reverse from django.test import override_settings +from django.urls import reverse from selenium.webdriver.common.by import By from selenium.webdriver.support.wait import WebDriverWait @@ -54,8 +54,7 @@ class FobiBrowserBuldDynamicFormsTest(BaseFobiBrowserBuldDynamicFormsTest): # Wait until the edit widget form opens WebDriverWait(self.driver, timeout=TIMEOUT).until( lambda driver: driver.find_element( - By.XPATH, - '//body[contains(@class, "theme-bootstrap3")]' + By.XPATH, '//body[contains(@class, "theme-bootstrap3")]' ) ) @@ -69,16 +68,14 @@ class FobiBrowserBuldDynamicFormsTest(BaseFobiBrowserBuldDynamicFormsTest): # Follow the create form link. # Click the button to go to dashboard edit self.driver.find_element( - By.XPATH, - '//a[contains(@class, "list-group-item")]' + By.XPATH, '//a[contains(@class, "list-group-item")]' ).click() # Wait until the dashboard edit view opens WebDriverWait(self.driver, timeout=TIMEOUT).until( # lambda driver: driver.find_element(By.ID, 'id_main') lambda driver: driver.find_element( - By.XPATH, - '//body[contains(@class, "theme-bootstrap3")]' + By.XPATH, '//body[contains(@class, "theme-bootstrap3")]' ) ) @@ -114,7 +111,7 @@ class FobiBrowserBuldDynamicFormsTest(BaseFobiBrowserBuldDynamicFormsTest): """successfully.') """ """and contains(@class, "alert-info")]""".format( constants.TEST_FORM_NAME - ) + ), ) ) @@ -159,30 +156,28 @@ class FobiBrowserBuldDynamicFormsTest(BaseFobiBrowserBuldDynamicFormsTest): add_form_element_link = self.driver.find_element( By.XPATH, """//a[contains(text(), 'Choose form element to add') and """ - """contains(@class, "dropdown-toggle")]""" + """contains(@class, "dropdown-toggle")]""", ) self._scroll_to(0, 0) add_form_element_link.click() # Find the parent element - add_form_element_parent_container = ( - add_form_element_link.find_element(By.XPATH, "..") + add_form_element_parent_container = add_form_element_link.find_element( + By.XPATH, ".." ) # Find the container of the available form elements add_form_element_available_elements_container = ( add_form_element_parent_container.find_element( - By.XPATH, - '//ul[contains(@class, "dropdown-menu")]' + By.XPATH, '//ul[contains(@class, "dropdown-menu")]' ) ) # Click on the element we want form_element_to_add = ( add_form_element_available_elements_container.find_element( - By.XPATH, - '//a[text()="{0}"]'.format(form_element_name) + By.XPATH, '//a[text()="{0}"]'.format(form_element_name) ) ) @@ -204,7 +199,7 @@ class FobiBrowserBuldDynamicFormsTest(BaseFobiBrowserBuldDynamicFormsTest): lambda driver: driver.find_element( By.XPATH, """//h1[contains(text(), 'Add "{0}" element to """ - """the form')]""".format(form_element_name) + """the form')]""".format(form_element_name), ) ) @@ -219,8 +214,7 @@ class FobiBrowserBuldDynamicFormsTest(BaseFobiBrowserBuldDynamicFormsTest): # Click add widget button submit_button = self.driver.find_element( - By.XPATH, - '//button[@type="submit"]' + By.XPATH, '//button[@type="submit"]' ) submit_button.click() @@ -242,7 +236,7 @@ class FobiBrowserBuldDynamicFormsTest(BaseFobiBrowserBuldDynamicFormsTest): """was added successfully.') """ """and contains(@class, "alert-info")]""".format( form_element_name - ) + ), ) ) @@ -293,7 +287,7 @@ class FobiBrowserBuldDynamicFormsTest(BaseFobiBrowserBuldDynamicFormsTest): """//label[contains(text(), '({0})') """ """and contains(@class, "control-label")]""".format( form_element_name - ) + ), ) # Get the parent of the label @@ -303,9 +297,10 @@ class FobiBrowserBuldDynamicFormsTest(BaseFobiBrowserBuldDynamicFormsTest): # Click the add form element button to add a new form element to the # form. - delete_form_element_link = delete_form_element_label_parent_container.find_element( - By.PARTIAL_LINK_TEXT, - "Delete" + delete_form_element_link = ( + delete_form_element_label_parent_container.find_element( + By.PARTIAL_LINK_TEXT, "Delete" + ) ) # delete_form_element_link.click() # self._click(delete_form_element_link) @@ -321,7 +316,7 @@ class FobiBrowserBuldDynamicFormsTest(BaseFobiBrowserBuldDynamicFormsTest): """was deleted successfully.') """ """and contains(@class, "alert-info")]""".format( form_element_name - ) + ), ) ) @@ -350,8 +345,7 @@ class FobiBrowserBuldDynamicFormsTest(BaseFobiBrowserBuldDynamicFormsTest): # an exception about non-visible element on the page # that we're trying to fetch. form_handlers_tab_link = self.driver.find_element( - By.XPATH, - """//a[@href="#tab-form-handlers"]""" + By.XPATH, """//a[@href="#tab-form-handlers"]""" ) form_handlers_tab_link.click() @@ -360,28 +354,26 @@ class FobiBrowserBuldDynamicFormsTest(BaseFobiBrowserBuldDynamicFormsTest): add_form_handler_link = self.driver.find_element( By.XPATH, """//a[contains(text(), 'Choose form handler to add') """ - """and contains(@class, "dropdown-toggle")]""" + """and contains(@class, "dropdown-toggle")]""", ) add_form_handler_link.click() # Find the parent element - add_form_handler_parent_container = ( - add_form_handler_link.find_element(By.XPATH, "..") + add_form_handler_parent_container = add_form_handler_link.find_element( + By.XPATH, ".." ) # Find the container of the available form elements add_form_handler_available_elements_container = ( add_form_handler_parent_container.find_element( - By.XPATH, - '//ul[contains(@class, "dropdown-menu")]' + By.XPATH, '//ul[contains(@class, "dropdown-menu")]' ) ) # Click on the element we want form_handler_to_add = ( add_form_handler_available_elements_container.find_element( - By.XPATH, - '//a[text()="{0}"]'.format(form_handler_name) + By.XPATH, '//a[text()="{0}"]'.format(form_handler_name) ) ) form_handler_to_add.click() @@ -393,7 +385,7 @@ class FobiBrowserBuldDynamicFormsTest(BaseFobiBrowserBuldDynamicFormsTest): lambda driver: driver.find_element( By.XPATH, """//h1[contains(text(), 'Add "{0}" handler to """ - """the form')]""".format(form_handler_name) + """the form')]""".format(form_handler_name), ) ) @@ -404,8 +396,7 @@ class FobiBrowserBuldDynamicFormsTest(BaseFobiBrowserBuldDynamicFormsTest): # Click add widget button self.driver.find_element( - By.XPATH, - '//button[@type="submit"]' + By.XPATH, '//button[@type="submit"]' ).click() # Wait until the fobi page opens with the form element in. @@ -416,7 +407,7 @@ class FobiBrowserBuldDynamicFormsTest(BaseFobiBrowserBuldDynamicFormsTest): """was added successfully.') """ """and contains(@class, "alert-info")]""".format( form_handler_name - ) + ), ) ) @@ -458,8 +449,7 @@ class FobiBrowserBuldDynamicFormsTest(BaseFobiBrowserBuldDynamicFormsTest): # an exception about non-visible element on the page # that we're trying to fetch. form_handlers_tab_link = self.driver.find_element( - By.XPATH, - """//a[@href="#tab-form-handlers"]""" + By.XPATH, """//a[@href="#tab-form-handlers"]""" ) form_handlers_tab_link.click() @@ -467,7 +457,7 @@ class FobiBrowserBuldDynamicFormsTest(BaseFobiBrowserBuldDynamicFormsTest): # from the form. delete_form_handler_label = self.driver.find_element( By.XPATH, - """//td[contains(text(), '{0}')]""".format(form_handler_name) + """//td[contains(text(), '{0}')]""".format(form_handler_name), ) # Get the parent of the label @@ -477,9 +467,10 @@ class FobiBrowserBuldDynamicFormsTest(BaseFobiBrowserBuldDynamicFormsTest): # Click the add form element button to add a new form element to the # form. - delete_form_handler_link = delete_form_handler_label_parent_container.find_element( - By.PARTIAL_LINK_TEXT, - "Delete" + delete_form_handler_link = ( + delete_form_handler_label_parent_container.find_element( + By.PARTIAL_LINK_TEXT, "Delete" + ) ) delete_form_handler_link.click() @@ -493,7 +484,7 @@ class FobiBrowserBuldDynamicFormsTest(BaseFobiBrowserBuldDynamicFormsTest): """was deleted successfully.') """ """and contains(@class, "alert-info")]""".format( form_handler_name - ) + ), ) ) @@ -623,8 +614,7 @@ class FobiBrowserBuldDynamicFormsTest(BaseFobiBrowserBuldDynamicFormsTest): # Wait until the edit widget form opens WebDriverWait(self.driver, timeout=TIMEOUT).until( lambda driver: driver.find_element( - By.XPATH, - '//body[contains(@class, "theme-bootstrap3")]' + By.XPATH, '//body[contains(@class, "theme-bootstrap3")]' ) ) @@ -642,15 +632,13 @@ class FobiBrowserBuldDynamicFormsTest(BaseFobiBrowserBuldDynamicFormsTest): # Wait until button is there WebDriverWait(self.driver, timeout=TIMEOUT).until( lambda driver: driver.find_element( - By.XPATH, - '//button[@type="submit"]' + By.XPATH, '//button[@type="submit"]' ) ) # Click add widget button submit_button = self.driver.find_element( - By.XPATH, - '//button[@type="submit"]' + By.XPATH, '//button[@type="submit"]' ) self._sleep(2) @@ -677,7 +665,7 @@ class FobiBrowserBuldDynamicFormsTest(BaseFobiBrowserBuldDynamicFormsTest): """successfully.') """ """and contains(@class, "alert-info")]""".format( constants.TEST_FORM_NAME - ) + ), ) ) diff --git a/src/fobi/tests/test_core.py b/src/fobi/tests/test_core.py index e09a8704..642d20e0 100644 --- a/src/fobi/tests/test_core.py +++ b/src/fobi/tests/test_core.py @@ -4,10 +4,6 @@ from django.test import RequestFactory, TestCase from django.urls import reverse from django.utils import timezone -from .constants import TEST_FORM_NAME, TEST_FORM_SLUG -from .core import print_info -from .helpers import get_or_create_admin_user, setup_app - from fobi.base import ( get_registered_form_callbacks, get_registered_form_element_plugins, @@ -17,6 +13,10 @@ from fobi.base import ( from fobi.forms import FormEntryForm from fobi.models import FormEntry, FormWizardEntry +from .constants import TEST_FORM_NAME, TEST_FORM_SLUG +from .core import print_info +from .helpers import get_or_create_admin_user, setup_app + __title__ = "fobi.tests.test_core" __author__ = "Artur Barseghyan " __copyright__ = "2014-2022 Artur Barseghyan" diff --git a/src/fobi/tests/test_dynamic_forms.py b/src/fobi/tests/test_dynamic_forms.py index b8297054..ff43e744 100644 --- a/src/fobi/tests/test_dynamic_forms.py +++ b/src/fobi/tests/test_dynamic_forms.py @@ -1,5 +1,7 @@ from django.test import TestCase +from fobi.dynamic import assemble_form_class + from .core import print_info from .data import TEST_DYNAMIC_FORMS_DEFINITION_DATA from .helpers import ( @@ -8,8 +10,6 @@ from .helpers import ( setup_app, ) -from fobi.dynamic import assemble_form_class - __title__ = "fobi.tests.test_dynamic_forms" __author__ = "Artur Barseghyan " __copyright__ = "2014-2022 Artur Barseghyan" diff --git a/src/fobi/tests/test_feincms_integration.py b/src/fobi/tests/test_feincms_integration.py index a48ee5a9..ae21727a 100644 --- a/src/fobi/tests/test_feincms_integration.py +++ b/src/fobi/tests/test_feincms_integration.py @@ -38,8 +38,7 @@ class FeinCMSIntegrationTest(BaseFobiBrowserBuldDynamicFormsTest): # Wait until the edit widget form opens WebDriverWait(self.driver, timeout=TIMEOUT).until( lambda driver: driver.find_element( - By.XPATH, - '//body[contains(@class, "theme-bootstrap3")]' + By.XPATH, '//body[contains(@class, "theme-bootstrap3")]' ) ) # TODO: diff --git a/src/fobi/tests/test_form_importers_mailchimp.py b/src/fobi/tests/test_form_importers_mailchimp.py index 23c0b565..c3e2bcd3 100644 --- a/src/fobi/tests/test_form_importers_mailchimp.py +++ b/src/fobi/tests/test_form_importers_mailchimp.py @@ -1,15 +1,15 @@ # from django.contrib.auth import get_user_model from django.test import TestCase -from .core import print_info -from .data import TEST_MAILCHIMP_IMPORTER_FORM_DATA -from .helpers import get_or_create_admin_user, setup_app - from fobi.contrib.plugins.form_importers.mailchimp_importer.fobi_form_importers import ( MailChimpImporter, ) from fobi.models import FormElementEntry, FormEntry +from .core import print_info +from .data import TEST_MAILCHIMP_IMPORTER_FORM_DATA +from .helpers import get_or_create_admin_user, setup_app + __title__ = "fobi.tests.test_form_importers_mailchimp" __author__ = "Artur Barseghyan " __copyright__ = "2014-2022 Artur Barseghyan" diff --git a/src/fobi/tests/test_sortable_dict.py b/src/fobi/tests/test_sortable_dict.py index 07d6169f..364b29de 100644 --- a/src/fobi/tests/test_sortable_dict.py +++ b/src/fobi/tests/test_sortable_dict.py @@ -2,10 +2,10 @@ from copy import copy from django.test import TestCase -from .core import print_info - from fobi.data_structures import SortableDict +from .core import print_info + __title__ = "fobi.tests.test_dynamic_forms" __author__ = "Artur Barseghyan " __copyright__ = "2014-2022 Artur Barseghyan" diff --git a/src/fobi/views/class_based.py b/src/fobi/views/class_based.py index cadd8e56..322e6124 100644 --- a/src/fobi/views/class_based.py +++ b/src/fobi/views/class_based.py @@ -255,7 +255,7 @@ class DashboardView(PermissionMixin, ListView): """ queryset = FormEntry._default_manager.filter( user__pk=self.request.user.pk - ).select_related('user') + ).select_related("user") ordering = self.get_ordering() if ordering: if isinstance(ordering, str):