From 903e7dfac2df907311e7551d805a7f690a81a2bc Mon Sep 17 00:00:00 2001 From: Artur Barseghyan Date: Tue, 20 Sep 2016 16:59:05 +0200 Subject: [PATCH] time pep8 --- .../form_elements/fields/time/__init__.py | 3 +- .../plugins/form_elements/fields/time/apps.py | 2 + .../fields/time/fobi_form_elements.py | 32 ++++++------- .../form_elements/fields/time/forms.py | 47 +++++++++++-------- 4 files changed, 47 insertions(+), 37 deletions(-) diff --git a/src/fobi/contrib/plugins/form_elements/fields/time/__init__.py b/src/fobi/contrib/plugins/form_elements/fields/time/__init__.py index a403a251..0725bfd8 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/time/__init__.py +++ b/src/fobi/contrib/plugins/form_elements/fields/time/__init__.py @@ -6,6 +6,7 @@ __copyright__ = '2014-2016 Artur Barseghyan' __license__ = 'GPL 2.0/LGPL 2.1' __all__ = ('default_app_config', 'UID',) -default_app_config = 'fobi.contrib.plugins.form_elements.fields.time.apps.Config' +default_app_config = 'fobi.contrib.plugins.form_elements.fields.' \ + 'time.apps.Config' UID = 'time' diff --git a/src/fobi/contrib/plugins/form_elements/fields/time/apps.py b/src/fobi/contrib/plugins/form_elements/fields/time/apps.py index b5c4cd91..00a22173 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/time/apps.py +++ b/src/fobi/contrib/plugins/form_elements/fields/time/apps.py @@ -10,6 +10,8 @@ try: from django.apps import AppConfig class Config(AppConfig): + """Config.""" + name = 'fobi.contrib.plugins.form_elements.fields.time' label = 'fobi_contrib_plugins_form_elements_fields_time' 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 d92226db..7deae8e5 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,11 +1,5 @@ from __future__ import absolute_import -__title__ = 'fobi.contrib.plugins.form_elements.fields.time.fobi_form_elements' -__author__ = 'Artur Barseghyan ' -__copyright__ = '2014-2016 Artur Barseghyan' -__license__ = 'GPL 2.0/LGPL 2.1' -__all__ = ('TimeInputPlugin',) - from django.forms.fields import TimeField from django.forms.widgets import TextInput from django.utils.translation import ugettext_lazy as _ @@ -15,21 +9,26 @@ from fobi.base import FormFieldPlugin, form_element_plugin_registry, get_theme from . import UID from .forms import TimeInputForm +__title__ = 'fobi.contrib.plugins.form_elements.fields.' \ + 'time.fobi_form_elements' +__author__ = 'Artur Barseghyan ' +__copyright__ = '2014-2016 Artur Barseghyan' +__license__ = 'GPL 2.0/LGPL 2.1' +__all__ = ('TimeInputPlugin',) + theme = get_theme(request=None, as_instance=True) + class TimeInputPlugin(FormFieldPlugin): - """ - Time field plugin. - """ + """Time field plugin.""" + uid = UID name = _("Time") group = _("Fields") form = TimeInputForm def get_form_field_instances(self, request=None): - """ - Get form field instances. - """ + """Get form field instances.""" widget_attrs = { 'class': theme.form_element_html_class, 'type': 'time', @@ -39,18 +38,17 @@ class TimeInputPlugin(FormFieldPlugin): 'label': self.data.label, 'help_text': self.data.help_text, 'initial': self.data.initial, - #'input_formats': self.data.input_formats, + # 'input_formats': self.data.input_formats, 'required': self.data.required, 'widget': TextInput(attrs=widget_attrs), } - #if self.data.input_formats: - # kwargs['input_formats'] = self.data.input_formats + # if self.data.input_formats: + # kwargs['input_formats'] = self.data.input_formats return [(self.data.name, TimeField, kwargs)] def submit_plugin_form_data(self, form_entry, request, form): - """ - Submit plugin form data/process. + """Submit plugin form data/process. :param fobi.models.FormEntry form_entry: Instance of ``fobi.models.FormEntry``. diff --git a/src/fobi/contrib/plugins/form_elements/fields/time/forms.py b/src/fobi/contrib/plugins/form_elements/fields/time/forms.py index ca64c444..a9b63f9b 100644 --- a/src/fobi/contrib/plugins/form_elements/fields/time/forms.py +++ b/src/fobi/contrib/plugins/form_elements/fields/time/forms.py @@ -1,22 +1,22 @@ from __future__ import absolute_import +from django import forms +from django.utils.translation import ugettext_lazy as _ + +from fobi.base import BaseFormFieldPluginForm, get_theme + __title__ = 'fobi.contrib.plugins.form_elements.fields.time.forms' __author__ = 'Artur Barseghyan ' __copyright__ = '2014-2016 Artur Barseghyan' __license__ = 'GPL 2.0/LGPL 2.1' __all__ = ('TimeInputForm',) -from django import forms -from django.utils.translation import ugettext_lazy as _ - -from fobi.base import BaseFormFieldPluginForm, get_theme - theme = get_theme(request=None, as_instance=True) + class TimeInputForm(forms.Form, BaseFormFieldPluginForm): - """ - Form for ``DateTimeInputPlugin``. - """ + """Form for ``TimeInputPlugin``.""" + plugin_data_fields = [ ("label", ""), ("name", ""), @@ -29,39 +29,48 @@ class TimeInputForm(forms.Form, BaseFormFieldPluginForm): label = forms.CharField( label=_("Label"), required=True, - widget=forms.widgets.TextInput(attrs={'class': theme.form_element_html_class}) + widget=forms.widgets.TextInput( + attrs={'class': theme.form_element_html_class} ) + ) name = forms.CharField( label=_("Name"), required=True, - widget=forms.widgets.TextInput(attrs={'class': theme.form_element_html_class}) + widget=forms.widgets.TextInput( + attrs={'class': theme.form_element_html_class} ) + ) help_text = forms.CharField( label=_("Help text"), required=False, - widget=forms.widgets.Textarea(attrs={'class': theme.form_element_html_class}) + widget=forms.widgets.Textarea( + attrs={'class': theme.form_element_html_class} ) + ) initial = forms.TimeField( label=_("Initial"), required=False, - widget = forms.widgets.TextInput(attrs={'class': theme.form_element_html_class, - 'type': 'time'}) + widget=forms.widgets.TextInput( + attrs={'class': theme.form_element_html_class, 'type': 'time'} ) + ) input_formats = forms.CharField( - label = _("Input formats"), + label=_("Input formats"), required=False, - widget=forms.widgets.TextInput(attrs={'class': theme.form_element_html_class}) + widget=forms.widgets.TextInput( + attrs={'class': theme.form_element_html_class} ) + ) required = forms.BooleanField( label=_("Required"), required=False, - widget=forms.widgets.CheckboxInput(attrs={'class': theme.form_element_checkbox_html_class}) + widget=forms.widgets.CheckboxInput( + attrs={'class': theme.form_element_checkbox_html_class} ) + ) def clean_initial(self): - """ - Clean the initial value. - """ + """Clean the initial value.""" initial = self.cleaned_data['initial'] try: return initial.strftime("%H:%M:%S")