make lint

turicas · Feb 15, 2022 · 30dca53 · 30dca53
1 parent f06fc41
commit 30dca53
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 111 deletions.
diff --git a/brasilio_auth/forms.py b/brasilio_auth/forms.py
@@ -18,47 +18,22 @@ def is_valid_username(username):
 
 class UserCreationForm(RegistrationFormUniqueEmail):
     username = forms.CharField(
-        widget=forms.TextInput(
-            attrs={
-                'type':'text', 
-                'class':"form-control"
-            }
-        ),
-        label=_("Usuário"),
-        required=True
+        widget=forms.TextInput(attrs={"type": "text", "class": "form-control"}), label=_("Usuário"), required=True
     )
 
     email = forms.EmailField(
-        widget=forms.TextInput(
-            attrs={
-                'placeholder': '[email protected]',
-                'type':'email',
-                'class':"form-control"
-            }
-        ),
-        required=True
+        widget=forms.TextInput(attrs={"placeholder": "[email protected]", "type": "email", "class": "form-control"}),
+        required=True,
     )
-    password1 = forms.CharField(label=_("Password"), widget=forms.PasswordInput(
-        attrs={
-            'class':"form-control"
-        }
-    ))
+    password1 = forms.CharField(label=_("Password"), widget=forms.PasswordInput(attrs={"class": "form-control"}))
     password2 = forms.CharField(
         label=_("Password confirmation"),
-        widget=forms.PasswordInput(
-        attrs={
-            'class':"form-control"
-        }),
+        widget=forms.PasswordInput(attrs={"class": "form-control"}),
         help_text=_("Enter the same password as above, for verification."),
     )
     captcha = ReCaptchaField()
-    subscribe_newsletter = forms.BooleanField(widget=forms.CheckboxInput(    
-            attrs={
-                'type':'checkbox',
-                'class':'form-check-input'
-            },
-        ),
-        required=False
+    subscribe_newsletter = forms.BooleanField(
+        widget=forms.CheckboxInput(attrs={"type": "checkbox", "class": "form-check-input"},), required=False
     )
 
     class Meta:

diff --git a/clipping/forms.py b/clipping/forms.py
@@ -8,64 +8,38 @@
 class ClippingForm(ModelForm):
     category = forms.CharField(
         widget=forms.Select(
-            attrs={
-                'aria-label': 'Seletor de categoria',
-                'class':'form-select'
-            },
-            choices=settings.CATEGORY_CHOICES
-        ), 
-        label="Categoria"
+            attrs={"aria-label": "Seletor de categoria", "class": "form-select"}, choices=settings.CATEGORY_CHOICES
+        ),
+        label="Categoria",
     )
     date = forms.CharField(
         widget=forms.TextInput(
             attrs={
-                "type":"text",
-                "class":"datepicker_input form-control",
-                "placeholder":"aaaa/mm/dd",
-                "autocomplete":"off",
+                "type": "text",
+                "class": "datepicker_input form-control",
+                "placeholder": "aaaa/mm/dd",
+                "autocomplete": "off",
             }
-        ), 
-        label="Data"
+        ),
+        label="Data",
     )
     vehicle = forms.CharField(
         widget=forms.TextInput(
-            attrs={
-                'type':'text',
-                'class':"form-control",
-                "placeholder":"Veículo que exibiu o conteúdo",
-            }
+            attrs={"type": "text", "class": "form-control", "placeholder": "Veículo que exibiu o conteúdo",}
         ),
-        label="Veículo"
+        label="Veículo",
     )
     author = forms.CharField(
-        widget=forms.TextInput(
-            attrs={
-                'type':'text',
-                'class':"form-control",
-                "placeholder":"Autor do conteúdo",
-            }
-        ),
-        label="Autor"
+        widget=forms.TextInput(attrs={"type": "text", "class": "form-control", "placeholder": "Autor do conteúdo",}),
+        label="Autor",
     )
     title = forms.CharField(
-        widget=forms.TextInput(
-            attrs={
-                'type':'text',
-                'class':"form-control",
-                "placeholder":"Título do conteúdo",
-            }
-        ),
-        label="Título"
+        widget=forms.TextInput(attrs={"type": "text", "class": "form-control", "placeholder": "Título do conteúdo",}),
+        label="Título",
     )
     url = forms.CharField(
-        widget=forms.TextInput(
-            attrs={
-                'type':'url',
-                'class':"form-control",
-                "placeholder":"http://site.com",
-            }
-        ),
-        label="URL"
+        widget=forms.TextInput(attrs={"type": "url", "class": "form-control", "placeholder": "http://site.com",}),
+        label="URL",
     )
 
     class Meta:

diff --git a/core/forms.py b/core/forms.py
@@ -45,27 +45,11 @@ def _get_name(obj, person_type):
 
 
 class ContactForm(forms.Form):
-    name = forms.CharField(
-        required=True,
-        label="Nome",
-        widget=forms.TextInput(
-            attrs={"class": "form-control"}
-        )
-    )
+    name = forms.CharField(required=True, label="Nome", widget=forms.TextInput(attrs={"class": "form-control"}))
     email = forms.EmailField(
-        required=True,
-        label="E-mail",
-        widget=forms.TextInput(
-            attrs={"class": "form-control", "autofocus": ""}
-        ),
-    )
-    message = forms.CharField(
-        required=True,
-        label="Mensagem",
-        widget=forms.Textarea(
-            attrs={"class": "form-control"}
-        ),
+        required=True, label="E-mail", widget=forms.TextInput(attrs={"class": "form-control", "autofocus": ""}),
     )
+    message = forms.CharField(required=True, label="Mensagem", widget=forms.Textarea(attrs={"class": "form-control"}),)
     captcha = ReCaptchaField()
 
 
@@ -79,29 +63,27 @@ def config_dynamic_filter(model_field):
         kwargs = {
             "required": False,
             "label": dynamic_field.title,
-            "widget": forms.TextInput(attrs={'type':'text', 'class':"form-control"}),
+            "widget": forms.TextInput(attrs={"type": "text", "class": "form-control"}),
         }
         field_factory = model_field.formfield
-        
+
         if dynamic_field.has_choices and dynamic_field.choices:
             choices = dynamic_field.choices.get("data", [])
             if dynamic_field.type == "date":
                 kwargs["widget"] = forms.TextInput(
                     attrs={
-                        "type":"text",
-                        "class":"datepicker_input form-control",
-                        "placeholder":"aaaa-mm-dd",
-                        "autocomplete":"off",
+                        "type": "text",
+                        "class": "datepicker_input form-control",
+                        "placeholder": "aaaa-mm-dd",
+                        "autocomplete": "off",
                         "data-min-date": min(choices),
                         "data-max-date": max(choices),
                     }
                 )
                 field_factory = forms.CharField
             else:
-                kwargs["choices"] = [("", "Todos")] + [
-                    (c, c if c != "None" else "(vazio)") for c in choices
-                ]
-                kwargs["widget"] = forms.Select(attrs={'class':'form-select'})
+                kwargs["choices"] = [("", "Todos")] + [(c, c if c != "None" else "(vazio)") for c in choices]
+                kwargs["widget"] = forms.Select(attrs={"class": "form-select"})
 
                 field_factory = forms.ChoiceField
 

diff --git a/core/views.py b/core/views.py
@@ -2,8 +2,8 @@
 import uuid
 
 from django.conf import settings
+from django.contrib import messages
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.messages import success
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.mail import EmailMessage
 from django.core.paginator import Paginator
@@ -22,7 +22,7 @@
 from core.util import cached_http_get_json
 from data_activities_log.activites import recent_activities
 from traffic_control.logging import log_blocked_request
-from django.contrib import messages
+
 
 class Echo:
     def write(self, value):
@@ -283,19 +283,19 @@ def dataset_table_detail(request, slug, tablename=""):
 def dataset_clipping_suggestion(request):
     if len(request.GET) > 0 and not request.user.is_authenticated:
         return redirect(f"{settings.LOGIN_URL}?next={request.get_full_path()}")
-    
+
     if request.method == "POST":
         clipping_form = ClippingForm(request.POST)
         if clipping_form.is_valid():
             clipping = clipping_form.save(commit=False)
             clipping.added_by = request.user
             clipping.save()
 
-            messages.success(request, "Sugestão enviada com sucesso", extra_tags='success')
-            
-            return redirect(request.POST.get('next', '/'))
+            messages.success(request, "Sugestão enviada com sucesso", extra_tags="success")
+
+            return redirect(request.POST.get("next", "/"))
         else:
-            messages.error(request, "Verifique o formulário novamente", extra_tags='danger')
+            messages.error(request, "Verifique o formulário novamente", extra_tags="danger")
     else:
         clipping_form = ClippingForm()