Pre-commit fix

conventions/forms/convention_form_logements.py

@@ -236,7 +236,9 @@ def clean_loyer(self):
         if (
             abs(
                 round_half_up(loyer, 2)
-                - round_half_up(surface_corrigee * loyer_par_metre_carre * coeficient, 2)
+                - round_half_up(
+                    surface_corrigee * loyer_par_metre_carre * coeficient, 2
+                )
             )
             > 1
         ):
@@ -255,6 +257,7 @@ class LogementSansLoyerForm(BaseLogementForm):
     Formulaire Logement formant la liste des logements d'une convention de type HLM,
     SEM, type I & 2 : une ligne du tableau des logements par surface réelle sans loyers
     """
+
     surface_annexes = forms.DecimalField(
         label="",
         max_digits=6,
@@ -508,9 +511,15 @@ def manage_coefficient_propre(self):
 
 
 LogementFormSet = formset_factory(LogementForm, formset=BaseLogementFormSet, extra=0)
-LogementSansLoyerFormSet = formset_factory(LogementSansLoyerForm, formset=BaseLogementFormSet, extra=0)
-LogementCorrigeeFormSet = formset_factory(LogementCorrigeeForm, formset=BaseLogementFormSet, extra=0)
-LogementCorrigeeSansLoyerFormSet = formset_factory(LogementCorrigeeSansLoyerForm, formset=BaseLogementFormSet, extra=0)
+LogementSansLoyerFormSet = formset_factory(
+    LogementSansLoyerForm, formset=BaseLogementFormSet, extra=0
+)
+LogementCorrigeeFormSet = formset_factory(
+    LogementCorrigeeForm, formset=BaseLogementFormSet, extra=0
+)
+LogementCorrigeeSansLoyerFormSet = formset_factory(
+    LogementCorrigeeSansLoyerForm, formset=BaseLogementFormSet, extra=0
+)
 
 
 class FoyerResidenceLogementForm(forms.Form):

conventions/forms/upload.py

@@ -10,4 +10,4 @@ class UploadForm(forms.Form):
                 + "de cliquer sur le bouton 'Déposer'"
             ),
         }
-    )
+    )

conventions/services/convention_generator.py

@@ -338,10 +338,6 @@ class PDFConversionError(Exception):
     pass
 
 
-class DocxGenerationError(Exception):
-    pass
-
-
 def run_pdf_convert_cmd(
     src_docx_path: Path, dst_pdf_path: Path
 ) -> subprocess.CompletedProcess:

conventions/services/utils.py

@@ -99,8 +99,12 @@ def get_form_date_value(form_instance, object_instance, field_name):
     )  # format_date_for_form(
 
 
-def build_partial_form(request, convention_object, field_list, non_attribute_field_list=[]):
+def build_partial_form(
+    request, convention_object, field_list, non_attribute_field_list=None
+):
     fields_dict = {}
+    if non_attribute_field_list is None:
+        non_attribute_field_list = []
     for field in field_list:
         fields_dict[field] = request.POST.get(field, getattr(convention_object, field))
     for non_attribute_field in non_attribute_field_list:

conventions/views/convention_form.py

@@ -381,9 +381,21 @@ def get(self, request, **kwargs):
                 **({"form": service.form} if service.form else {}),
                 **({"extra_forms": service.extra_forms} if service.extra_forms else {}),
                 **({"formset": service.formset} if service.formset else {}),
-                **({"formset_sans_loyer": service.formset_sans_loyer} if service.formset_sans_loyer else {}),
-                **({"formset_corrigee": service.formset_corrigee} if service.formset_corrigee else {}),
-                **({"formset_corrigee_sans_loyer": service.formset_corrigee_sans_loyer} if service.formset_corrigee_sans_loyer else {}),
+                **(
+                    {"formset_sans_loyer": service.formset_sans_loyer}
+                    if service.formset_sans_loyer
+                    else {}
+                ),
+                **(
+                    {"formset_corrigee": service.formset_corrigee}
+                    if service.formset_corrigee
+                    else {}
+                ),
+                **(
+                    {"formset_corrigee_sans_loyer": service.formset_corrigee_sans_loyer}
+                    if service.formset_corrigee_sans_loyer
+                    else {}
+                ),
                 # TODO: obsolète, pourra être supprimé après rédaction de tests unitaires sur extra_forms
                 "upform": service.upform,
                 "form_step": self.steps.get_form_step(),
@@ -435,9 +447,23 @@ def post(self, request, convention_uuid):
                     else {}
                 ),
                 **({"formset": self.service.formset} if self.service.formset else {}),
-                **({"formset_sans_loyer": self.service.formset_sans_loyer} if self.service.formset_sans_loyer else {}),
-                **({"formset_corrigee": self.service.formset_corrigee} if self.service.formset_corrigee else {}),
-                **({"formset_corrigee_sans_loyer": self.service.formset_corrigee_sans_loyer} if self.service.formset_corrigee_sans_loyer else {}),
+                **(
+                    {"formset_sans_loyer": self.service.formset_sans_loyer}
+                    if self.service.formset_sans_loyer
+                    else {}
+                ),
+                **(
+                    {"formset_corrigee": self.service.formset_corrigee}
+                    if self.service.formset_corrigee
+                    else {}
+                ),
+                **(
+                    {
+                        "formset_corrigee_sans_loyer": self.service.formset_corrigee_sans_loyer
+                    }
+                    if self.service.formset_corrigee_sans_loyer
+                    else {}
+                ),
                 "form_step": self.steps.get_form_step(),
                 **(
                     {"import_warnings": self.service.import_warnings}

programmes/models/models.py

@@ -524,19 +524,27 @@ def annexes(self):
 
     @property
     def logements_import_ordered(self):
-        return self.logements.filter(surface_corrigee__isnull=True, loyer__isnull=False).order_by("import_order")
-
+        return self.logements.filter(
+            surface_corrigee__isnull=True, loyer__isnull=False
+        ).order_by("import_order")
+
     @property
     def logements_sans_loyer_import_ordered(self):
-        return self.logements.filter(surface_corrigee__isnull=True, loyer__isnull=True).order_by("import_order")
-
+        return self.logements.filter(
+            surface_corrigee__isnull=True, loyer__isnull=True
+        ).order_by("import_order")
+
     @property
     def logements_corrigee_import_ordered(self):
-        return self.logements.filter(surface_corrigee__isnull=False, loyer__isnull=False).order_by("import_order")
-
+        return self.logements.filter(
+            surface_corrigee__isnull=False, loyer__isnull=False
+        ).order_by("import_order")
+
     @property
     def logements_corrigee_sans_loyer_import_ordered(self):
-        return self.logements.filter(surface_corrigee__isnull=False, loyer__isnull=True).order_by("import_order")
+        return self.logements.filter(
+            surface_corrigee__isnull=False, loyer__isnull=True
+        ).order_by("import_order")
 
     def clone(self, cloned_programme):
         parent_id = self.parent_id or self.id
@@ -834,7 +842,7 @@ class Meta:
         "Loyer maximum en € par m² de surface corrigée": "loyer_par_metre_carre",
         "Coefficient propre au logement": "coeficient",
         "Loyer maximum du logement en €\n(col 4 * col 5 * col 6)": "loyer",
-    }   
+    }
 
     needed_in_mapping = [
         "designation",
@@ -863,6 +871,7 @@ class Meta:
         "surface_corrigee",
     ]
 
+
 class Annexe(models.Model):
     id = models.AutoField(primary_key=True)
     uuid = models.UUIDField(default=uuid.uuid4, editable=False)