Refactor - clean

1 files changed, 44 insertions, 44 deletions

diff --git a/archaeological_files/models.py b/archaeological_files/models.py
index bef7d53a1..5b2c89e16 100644
--- a/archaeological_files/models.py
+++ b/archaeological_files/models.py
@@ -47,8 +47,8 @@ from archaeological_operations.models import get_values_town_related, \
 
 class FileType(GeneralType):
     class Meta:
-        verbose_name = _(u"Archaeological file type")
-        verbose_name_plural = _(u"Archaeological file types")
+        verbose_name = _("Archaeological file type")
+        verbose_name_plural = _("Archaeological file types")
         ordering = ('label',)
 
     @classmethod
@@ -67,8 +67,8 @@ post_delete.connect(post_save_cache, sender=FileType)
 
 class PermitType(GeneralType):
     class Meta:
-        verbose_name = _(u"Permit type")
-        verbose_name_plural = _(u"Permit types")
+        verbose_name = _("Permit type")
+        verbose_name_plural = _("Permit types")
         ordering = ('label',)
 
 
@@ -164,7 +164,7 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, CompleteIdentifierItem,
     ]
 
     COL_LABELS = {
-        'towns_label': _(u"Towns"),
+        'towns_label': _("Towns"),
     }
 
     REVERSED_BOOL_FIELDS = [
@@ -237,7 +237,7 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, CompleteIdentifierItem,
         ),
         'general_contractor__attached_to': SearchAltName(
             pgettext_lazy("key for text search",
-                          u"general-contractor-organization"),
+                          "general-contractor-organization"),
             'general_contractor__attached_to__cached_label__iexact'
         ),
     }
@@ -283,7 +283,7 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, CompleteIdentifierItem,
         verbose_name=_("Responsible for planning service"),
         on_delete=models.SET_NULL,)  # service instructeur - personne
     raw_town_planning_service = models.CharField(
-        _(u"Planning service (raw)"), max_length=200,
+        _("Planning service (raw)"), max_length=200,
         blank=True, null=True)
     planning_service = models.ForeignKey(
         Organization,
@@ -320,14 +320,14 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, CompleteIdentifierItem,
         saisine_type = models.ForeignKey(
             SaisineType, blank=True, null=True,
             on_delete=models.SET_NULL,
-            verbose_name=u"Type de saisine")
+            verbose_name="Type de saisine")
         instruction_deadline = models.DateField(_(u'Instruction deadline'),
                                                 blank=True, null=True)
-    total_surface = models.FloatField(_(u"Total surface (m2)"),
+    total_surface = models.FloatField(_("Total surface (m2)"),
                                       blank=True, null=True)
     total_developed_surface = models.FloatField(
-        _(u"Total developed surface (m2)"), blank=True, null=True)
-    locality = models.CharField(_(u"Locality"),
+        _("Total developed surface (m2)"), blank=True, null=True)
+    locality = models.CharField(_("Locality"),
                                 max_length=100, null=True, blank=True)
     address = models.TextField(_("Main address"), blank=True, default="")
     postal_code = models.CharField(_("Main address - postal code"),
@@ -335,34 +335,34 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, CompleteIdentifierItem,
     comment = models.TextField(_("Comment"), blank=True, default="")
     # research archaeology -->
     departments = models.ManyToManyField(
-        Department, verbose_name=_(u"Departments"), blank=True)
+        Department, verbose_name=_("Departments"), blank=True)
     requested_operation_type = models.ForeignKey(
         OperationType, related_name='+',
         on_delete=models.SET_NULL,
-        null=True, blank=True, verbose_name=_(u"Requested operation type"))
+        null=True, blank=True, verbose_name=_("Requested operation type"))
     organization = models.ForeignKey(
-        Organization, blank=True, null=True, verbose_name=_(u"Organization"),
+        Organization, blank=True, null=True, verbose_name=_("Organization"),
         related_name='files', on_delete=models.SET_NULL)
     scientist = models.ForeignKey(
         Person, blank=True, null=True, related_name='scientist',
-        on_delete=models.SET_NULL, verbose_name=_(u"Scientist in charge"))
+        on_delete=models.SET_NULL, verbose_name=_("Scientist in charge"))
     research_comment = models.TextField(
         _("Research archaeology comment"), blank=True, default="")
     classified_area = models.NullBooleanField(
-        _(u"Classified area"), blank=True, null=True)
+        _("Classified area"), blank=True, null=True)
     protected_area = models.NullBooleanField(
-        _(u"Protected area"), blank=True, null=True)
+        _("Protected area"), blank=True, null=True)
     if settings.COUNTRY == 'fr':
         cira_advised = models.NullBooleanField(
-            u"Passage en CIRA", blank=True, null=True)
+            "Passage en CIRA", blank=True, null=True)
         mh_register = models.NullBooleanField(
-            u"Sur Monument Historique classé", blank=True, null=True)
+            "Sur Monument Historique classé", blank=True, null=True)
         mh_listing = models.NullBooleanField(
-            u"Sur Monument Historique inscrit", blank=True, null=True)
+            "Sur Monument Historique inscrit", blank=True, null=True)
     # <-- research archaeology
 
     documents = models.ManyToManyField(
-        Document, related_name="files", verbose_name=_(u"Documents"),
+        Document, related_name="files", verbose_name=_("Documents"),
         blank=True)
 
     cached_label = models.TextField(
@@ -380,15 +380,15 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, CompleteIdentifierItem,
     ]
 
     class Meta:
-        verbose_name = _(u"Archaeological file")
-        verbose_name_plural = _(u"Archaeological files")
+        verbose_name = _("Archaeological file")
+        verbose_name_plural = _("Archaeological files")
         permissions = (
-            ("view_file", u"Can view all Archaeological files"),
-            ("view_own_file", u"Can view own Archaeological file"),
-            ("add_own_file", u"Can add own Archaeological file"),
-            ("change_own_file", u"Can change own Archaeological file"),
-            ("delete_own_file", u"Can delete own Archaeological file"),
-            ("close_file", u"Can close File"),
+            ("view_file", "Can view all Archaeological files"),
+            ("view_own_file", "Can view own Archaeological file"),
+            ("add_own_file", "Can add own Archaeological file"),
+            ("change_own_file", "Can change own Archaeological file"),
+            ("delete_own_file", "Can delete own Archaeological file"),
+            ("close_file", "Can close File"),
         )
         ordering = ('cached_label',)
         indexes = [
@@ -398,22 +398,22 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, CompleteIdentifierItem,
     @classmethod
     def _get_department_code(cls, value):
         if not settings.ISHTAR_DPTS:
-            return u""
+            return ""
         for k, v in settings.ISHTAR_DPTS:
             if v.lower() == value:
                 return k
-        return u""
+        return ""
 
     def _get_base_image_path(self):
-        return u"{}/{}".format(self.SLUG, self.reference or self.short_label)
+        return "{}/{}".format(self.SLUG, self.reference or self.short_label)
 
     @property
     def short_class_name(self):
-        return _(u"FILE")
+        return _("FILE")
 
     @property
     def full_internal_ref(self):
-        return u"{}{}".format(settings.ISHTAR_FILE_PREFIX or '',
+        return "{}{}".format(settings.ISHTAR_FILE_PREFIX or '',
                               self.external_id or '')
 
     @property
@@ -455,7 +455,7 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, CompleteIdentifierItem,
         address = ''
         if self.general_contractor:
             if self.general_contractor.name:
-                address = u" ".join([
+                address = " ".join([
                     str(getattr(self.general_contractor, key))
                     for key in ('title', 'surname', 'name')
                     if getattr(self.general_contractor, key)])
@@ -472,12 +472,12 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, CompleteIdentifierItem,
         if self.general_contractor and self.general_contractor.address:
             address = self.general_contractor.address
             if self.general_contractor.address_complement:
-                address += u" " + self.general_contractor.address_complement
+                address += " " + self.general_contractor.address_complement
         if not address and self.corporation_general_contractor and\
                 self.corporation_general_contractor.address:
             address = self.corporation_general_contractor.address
             if self.corporation_general_contractor.address_complement:
-                address += u" " + \
+                address += " " + \
                     self.corporation_general_contractor.address_complement
         return address
 
@@ -485,13 +485,13 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, CompleteIdentifierItem,
     def general_contractor_address_3(self):
         address = ''
         if self.general_contractor and self.general_contractor.postal_code:
-            address = u" ".join([
+            address = " ".join([
                 getattr(self.general_contractor, key)
                 for key in ('postal_code', 'town')
                 if getattr(self.general_contractor, key)])
         if not address and self.corporation_general_contractor and\
                 self.corporation_general_contractor.address:
-            address = u" ".join([
+            address = " ".join([
                 getattr(self.corporation_general_contractor, key)
                 for key in ('postal_code', 'town')
                 if getattr(self.corporation_general_contractor, key)])
@@ -576,7 +576,7 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, CompleteIdentifierItem,
 
     @property
     def reference(self):
-        return self.external_id or u""
+        return self.external_id or ""
 
     def _generate_cached_label(self):
         items = [self.get_town_label(), self.reference]
@@ -595,7 +595,7 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, CompleteIdentifierItem,
         elif self.towns.count() == 1:
             lbl = self.towns.all()[0].name
         elif self.towns.count() == 0:
-            lbl = str(_(u"No town"))
+            lbl = str(_("No town"))
         return lbl
 
     def get_department(self):
@@ -632,7 +632,7 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, CompleteIdentifierItem,
 
     @property
     def town_list(self):
-        return u", ".join([str(tw) for tw in self.towns.all()])
+        return ", ".join([str(tw) for tw in self.towns.all()])
 
     def total_surface_ha(self):
         if self.total_surface:
@@ -789,8 +789,8 @@ class FileByDepartment(models.Model):
     DELETE_SQL = """
     DROP VIEW IF EXISTS file_department;
     """
-    file = models.ForeignKey(File, verbose_name=_(u"File"))
-    department = models.ForeignKey(Department, verbose_name=_(u"Department"),
+    file = models.ForeignKey(File, verbose_name=_("File"))
+    department = models.ForeignKey(Department, verbose_name=_("Department"),
                                    on_delete=models.DO_NOTHING,
                                    blank=True, null=True)