Refactor - clean

6 files changed, 132 insertions, 132 deletions

diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py
index 9d2c14691..0108a8375 100644
--- a/archaeological_files/forms.py
+++ b/archaeological_files/forms.py
@@ -64,34 +64,34 @@ class FileSelect(DocumentItemSelect):
     internal_reference = forms.CharField(max_length=200,
                                          label=_("Other reference"))
     towns = get_town_field()
-    parcel = forms.CharField(label=_(u"Parcel"))
+    parcel = forms.CharField(label=_("Parcel"))
     if settings.ISHTAR_DPTS:
         towns__numero_insee__startswith = forms.ChoiceField(
-            label=_(u"Department"), choices=[])
-    name = forms.CharField(label=_(u"File name"), max_length=200)
+            label=_("Department"), choices=[])
+    name = forms.CharField(label=_("File name"), max_length=200)
     file_type = forms.ChoiceField(label=_("File type"), choices=[])
-    end_date = forms.NullBooleanField(label=_(u"Is active?"))
+    end_date = forms.NullBooleanField(label=_("Is active?"))
     saisine_type = forms.ChoiceField(label=_("Saisine type"), choices=[])
     permit_type = forms.ChoiceField(label=_("Permit type"), choices=[])
     permit_reference = forms.CharField(max_length=200,
                                        label=_("Permit reference"))
-    comment = forms.CharField(label=_(u"Comment"), max_length=500)
+    comment = forms.CharField(label=_("Comment"), max_length=500)
     in_charge = forms.IntegerField(
-        label=_(u"In charge"),
+        label=_("In charge"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-person',
                          args=[person_type_pk_lazy('sra_agent')]),
             associated_model=Person),
         validators=[valid_id(Person)])
     general_contractor = forms.IntegerField(
-        label=_(u"General contractor"),
+        label=_("General contractor"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-person',
                          args=[person_type_pk_lazy('general_contractor')]),
             associated_model=Person),
         validators=[valid_id(Person)])
     general_contractor__attached_to = forms.IntegerField(
-        label=_(u"Organization of general contractor"),
+        label=_("Organization of general contractor"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-organization',
                          args=[organization_type_pks_lazy([
@@ -99,14 +99,14 @@ class FileSelect(DocumentItemSelect):
             associated_model=Organization),
         validators=[valid_id(Organization)])
     history_creator = forms.IntegerField(
-        label=_(u"Created by"),
+        label=_("Created by"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-person',
                          args=['0', 'user']),
             associated_model=Person),
         validators=[valid_id(Person)])
     history_modifier = forms.IntegerField(
-        label=_(u"Modified by"),
+        label=_("Modified by"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-person',
                          args=['0', 'user']),
@@ -155,8 +155,8 @@ class FileFormMultiSelection(LockForm, MultiSearchForm):
         validators=[valid_ids(models.File)])
 
 
-DATE_SOURCE = (('creation', _(u"Creation date")),
-               ("reception", _(u"Reception date")))
+DATE_SOURCE = (('creation', _("Creation date")),
+               ("reception", _("Reception date")))
 
 
 class DashboardForm(IshtarForm):
@@ -171,9 +171,9 @@ class DashboardForm(IshtarForm):
     saisine_type = forms.ChoiceField(
         label=_("Saisine type"), choices=[], required=False)
     after = forms.DateField(
-        label=_(u"Date after"), widget=DatePicker, required=False)
+        label=_("Date after"), widget=DatePicker, required=False)
     before = forms.DateField(
-        label=_(u"Date before"), widget=DatePicker, required=False)
+        label=_("Date before"), widget=DatePicker, required=False)
 
     def __init__(self, *args, **kwargs):
         if 'prefix' not in kwargs:
@@ -230,9 +230,9 @@ class FileFormGeneral(ManageOldType):
     numeric_reference = forms.IntegerField(
         label=_("Numeric reference"), widget=forms.HiddenInput, required=False)
     internal_reference = forms.CharField(
-        label=_(u"Other reference"), max_length=60, required=False)
-    name = forms.CharField(label=_(u"Name"), required=False, max_length=100)
-    creation_date = forms.DateField(label=_(u"Creation date"),
+        label=_("Other reference"), max_length=60, required=False)
+    name = forms.CharField(label=_("Name"), required=False, max_length=100)
+    creation_date = forms.DateField(label=_("Creation date"),
                                     initial=get_now, widget=DatePicker)
     file_type = forms.ChoiceField(label=_("File type"), choices=[])
     related_file = forms.IntegerField(
@@ -240,11 +240,11 @@ class FileFormGeneral(ManageOldType):
         widget=widgets.JQueryAutoComplete(reverse_lazy('autocomplete-file'),
                                           associated_model=models.File),
         validators=[valid_id(models.File)])
-    comment = forms.CharField(label=_(u"Comment"), widget=forms.Textarea,
+    comment = forms.CharField(label=_("Comment"), widget=forms.Textarea,
                               required=False)
     total_surface = forms.FloatField(
         required=False, widget=widgets.AreaWidget,
-        label=_(u"Total surface (m2)"),
+        label=_("Total surface (m2)"),
         validators=[validators.MinValueValidator(0),
                     validators.MaxValueValidator(999999999)])
     address = forms.CharField(label=_("Main address"), widget=forms.Textarea)
@@ -262,16 +262,16 @@ class FileFormGeneral(ManageOldType):
                   .exclude(internal_reference='').order_by('-pk')
         if q.count() and 'internal_reference' in self.fields:
             lbl = self.fields['internal_reference'].label
-            lbl += _(u"<br/>(last recorded: %s)") % (
+            lbl += _("<br/>(last recorded: %s)") % (
                 q.all()[0].internal_reference)
             self.fields['internal_reference'].label = mark_safe(lbl)
 
 
 class FileFormGeneralRO(FileFormGeneral):
     year = forms.IntegerField(
-        label=_(u"Year"), widget=forms.TextInput(attrs={'readonly': True}))
+        label=_("Year"), widget=forms.TextInput(attrs={'readonly': True}))
     numeric_reference = forms.IntegerField(
-        label=_(u"Numeric reference"), widget=forms.TextInput())
+        label=_("Numeric reference"), widget=forms.TextInput())
     id = forms.IntegerField(' ', widget=forms.HiddenInput, required=False)
 
     def clean(self):
@@ -284,13 +284,13 @@ class FileFormGeneralRO(FileFormGeneral):
                        .exclude(pk=pk)
         if numeric_reference and q.count():
             raise forms.ValidationError(
-                _(u"Another file with this numeric id exists."))
+                _("Another file with this numeric id exists."))
         return cleaned_data
 
 
 ParcelFormset = formset_factory(ParcelForm, can_delete=True,
                                 formset=ParcelFormSet)
-ParcelFormset.form_label = _(u"Parcels")
+ParcelFormset.form_label = _("Parcels")
 ParcelFormset.form_admin_name = _("Archaeological file - 020 - Parcel")
 ParcelFormset.form_slug = "file-020-parcels"
 
@@ -325,20 +325,20 @@ class FileFormPreventive(ManageOldType, forms.Form):
                     ]},
             associated_model=Person, new=True),
         validators=[valid_id(Person)])
-    permit_type = forms.ChoiceField(label=_(u"Permit type"), required=False,
+    permit_type = forms.ChoiceField(label=_("Permit type"), required=False,
                                     choices=[])
     permit_reference = forms.CharField(
-        label=_(u"Permit reference"), required=False,
+        label=_("Permit reference"), required=False,
         validators=[validators.MaxLengthValidator(60)])
     total_developed_surface = forms.FloatField(
-        widget=widgets.AreaWidget, label=_(u"Total developed surface (m2)"),
+        widget=widgets.AreaWidget, label=_("Total developed surface (m2)"),
         required=False, validators=[validators.MinValueValidator(0),
                                     validators.MaxValueValidator(999999999)])
     if settings.COUNTRY == 'fr':
-        saisine_type = forms.ChoiceField(label=_(u"Saisine type"),
+        saisine_type = forms.ChoiceField(label=_("Saisine type"),
                                          choices=[])
     reception_date = forms.DateField(
-        label=_(u"Reception date"), initial=get_now, widget=DatePicker)
+        label=_("Reception date"), initial=get_now, widget=DatePicker)
 
     def __init__(self, *args, **kwargs):
         super(FileFormPreventive, self).__init__(*args, **kwargs)
@@ -393,19 +393,19 @@ class FileFormResearch(CustomForm, ManageOldType, forms.Form):
         validators=[valid_id(Organization)], required=False,
     )
     if settings.COUNTRY == 'fr':
-        cira_advised = forms.NullBooleanField(label=u"Passage en CIRA",
+        cira_advised = forms.NullBooleanField(label="Passage en CIRA",
                                               required=False)
     research_comment = forms.CharField(
-        label=_(u"Comment"), widget=forms.Textarea, required=False)
+        label=_("Comment"), widget=forms.Textarea, required=False)
     if settings.COUNTRY == 'fr':
         mh_register = forms.NullBooleanField(
-            label=u"Sur Monument Historique classé", required=False)
+            label="Sur Monument Historique classé", required=False)
         mh_listing = forms.NullBooleanField(
-            label=u"Sur Monument Historique inscrit", required=False)
+            label="Sur Monument Historique inscrit", required=False)
     classified_area = forms.NullBooleanField(
-        label=_(u"Classified area"), required=False)
+        label=_("Classified area"), required=False)
     protected_area = forms.NullBooleanField(
-        label=_(u"Protected area"), required=False)
+        label=_("Protected area"), required=False)
 
     def __init__(self, *args, **kwargs):
         super(FileFormResearch, self).__init__(*args, **kwargs)
@@ -420,34 +420,34 @@ class FileFormResearch(CustomForm, ManageOldType, forms.Form):
 
 class FinalFileClosingForm(FinalForm):
     confirm_msg = " "
-    confirm_end_msg = _(u"Would you like to close this archaeological file?")
+    confirm_end_msg = _("Would you like to close this archaeological file?")
 
 
 class FinalFileDeleteForm(FinalForm):
     confirm_msg = " "
-    confirm_end_msg = _(u"Would you like to delete this archaeological file ?")
+    confirm_end_msg = _("Would you like to delete this archaeological file ?")
 
 
 class AdministrativeActFileModifySelect(TableSelect):
     _model = AdministrativeAct
 
     search_vector = forms.CharField(
-        label=_(u"Full text search"), widget=widgets.SearchWidget(
+        label=_("Full text search"), widget=widgets.SearchWidget(
             'archaeological-operations', 'administrativeact',
             'administrativeactfile',
         ))
     year = forms.IntegerField(label=_("Year"))
     index = forms.IntegerField(label=_("Index"))
     if settings.COUNTRY == 'fr':
-        ref_sra = forms.CharField(label=u"Référence SRA",
+        ref_sra = forms.CharField(label="Référence SRA",
                                   max_length=15)
     act_type = forms.ChoiceField(label=_("Act type"), choices=[])
-    act_object = forms.CharField(label=_(u"Object (full text search)"),
+    act_object = forms.CharField(label=_("Object (full text search)"),
                                  max_length=300)
     operation__towns = get_town_field()
     if settings.ISHTAR_DPTS:
         operation__towns__numero_insee__startswith = forms.ChoiceField(
-            label=_(u"Department"), choices=[])
+            label=_("Department"), choices=[])
 
     def __init__(self, *args, **kwargs):
         super(AdministrativeActFileModifySelect, self).__init__(*args,
@@ -467,33 +467,33 @@ class AdministrativeActFileSelect(TableSelect):
     _model = AdministrativeAct
 
     search_vector = forms.CharField(
-        label=_(u"Full text search"), widget=widgets.SearchWidget(
+        label=_("Full text search"), widget=widgets.SearchWidget(
             'archaeological-operations', 'administrativeact',
             'administrativeactfile',
         ))
     year = forms.IntegerField(label=_("Year"))
     index = forms.IntegerField(label=_("Index"))
     if settings.COUNTRY == 'fr':
-        ref_sra = forms.CharField(label=u"Autre référence",
+        ref_sra = forms.CharField(label="Autre référence",
                                   max_length=15)
     act_type = forms.ChoiceField(label=_("Act type"), choices=[])
-    indexed = forms.NullBooleanField(label=_(u"Indexed?"))
+    indexed = forms.NullBooleanField(label=_("Indexed?"))
     associated_file__towns = get_town_field()
-    parcel = forms.CharField(label=_(u"Parcel"))
+    parcel = forms.CharField(label=_("Parcel"))
     if settings.ISHTAR_DPTS:
         associated_file__towns__numero_insee__startswith = forms.ChoiceField(
-            label=_(u"Department"), choices=[])
-    act_object = forms.CharField(label=_(u"Object"),
+            label=_("Department"), choices=[])
+    act_object = forms.CharField(label=_("Object"),
                                  max_length=300)
 
     signature_date_before = forms.DateField(
-        label=_(u"Signature date before"), widget=DatePicker)
+        label=_("Signature date before"), widget=DatePicker)
     signature_date_after = forms.DateField(
-        label=_(u"Signature date after"), widget=DatePicker)
+        label=_("Signature date after"), widget=DatePicker)
     associated_file__name = forms.CharField(
-        label=_(u"File name"), max_length=200)
+        label=_("File name"), max_length=200)
     associated_file__general_contractor = forms.IntegerField(
-        label=_(u"General contractor"),
+        label=_("General contractor"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy(
                 'autocomplete-person',
@@ -501,7 +501,7 @@ class AdministrativeActFileSelect(TableSelect):
                 associated_model=Person),
         validators=[valid_id(Person)])
     associated_file__general_contractor__attached_to = forms.IntegerField(
-        label=_(u"Organization of general contractor"),
+        label=_("Organization of general contractor"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy(
                 'autocomplete-organization',
@@ -514,7 +514,7 @@ class AdministrativeActFileSelect(TableSelect):
     associated_file__internal_reference = forms.CharField(
         max_length=200, label=_("File other reference"))
     associated_file__in_charge = forms.IntegerField(
-        label=_(u"File in charge"),
+        label=_("File in charge"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy(
                 'autocomplete-person',
@@ -524,7 +524,7 @@ class AdministrativeActFileSelect(TableSelect):
     associated_file__permit_reference = forms.CharField(
         max_length=200, label=_("File permit reference"))
     history_creator = forms.IntegerField(
-        label=_(u"Created by"),
+        label=_("Created by"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy(
                 'autocomplete-person',
@@ -532,7 +532,7 @@ class AdministrativeActFileSelect(TableSelect):
             associated_model=Person),
         validators=[valid_id(Person)])
     history_modifier = forms.IntegerField(
-        label=_(u"Modified by"),
+        label=_("Modified by"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-person',
                          args=['0', 'user']),
@@ -576,9 +576,9 @@ class AdministrativeActFileModifyFormSelection(
 
 
 class AdministrativeActFileForm(AdministrativeActForm):
-    form_admin_name = _(u"Archaeological file - Administrative act - General")
+    form_admin_name = _("Archaeological file - Administrative act - General")
     form_slug = "file-adminact-general"
-    act_type = forms.ChoiceField(label=_(u"Act type"), choices=[])
+    act_type = forms.ChoiceField(label=_("Act type"), choices=[])
 
     TYPES = [
         FieldType('act_type', ActType,
diff --git a/archaeological_files/ishtar_menu.py b/archaeological_files/ishtar_menu.py
index 889d27287..7c5f870a6 100644
--- a/archaeological_files/ishtar_menu.py
+++ b/archaeological_files/ishtar_menu.py
@@ -30,47 +30,47 @@ from . import models
 MENU_SECTIONS = [
     (20,
      SectionItem(
-         'file_management', _(u"Archaeological file"),
+         'file_management', _("Archaeological file"),
          profile_restriction='files',
          css='menu-file',
          childs=[
              MenuItem(
-                 'file_search', _(u"Search"),
+                 'file_search', _("Search"),
                  model=models.File,
                  access_controls=['view_file', 'view_own_file']),
              MenuItem(
-                 'file_creation', _(u"Creation"),
+                 'file_creation', _("Creation"),
                  model=models.File,
                  access_controls=['add_file', 'add_own_file']),
              MenuItem(
-                 'file_modification', _(u"Modification"),
+                 'file_modification', _("Modification"),
                  model=models.File,
                  access_controls=['change_file', 'change_own_file']),
              MenuItem(
-                 'file_closing', _(u"Closing"),
+                 'file_closing', _("Closing"),
                  model=models.File,
                  access_controls=['close_file']),
              MenuItem(
-                 'file_deletion', _(u"Deletion"),
+                 'file_deletion', _("Deletion"),
                  model=models.File,
                  access_controls=['delete_file', 'delete_own_file']),
              SectionItem(
-                 'admin_act_files', _(u"Administrative act"),
+                 'admin_act_files', _("Administrative act"),
                  childs=[
                      MenuItem('file_administrativeactfil_search',
-                              _(u"Search"),
+                              _("Search"),
                               model=AdministrativeAct,
                               access_controls=['change_administrativeact']),
                      MenuItem('file_administrativeactfil',
-                              _(u"Creation"),
+                              _("Creation"),
                               model=AdministrativeAct,
                               access_controls=['change_administrativeact']),
                      MenuItem('file_administrativeactfil_modification',
-                              _(u"Modification"),
+                              _("Modification"),
                               model=AdministrativeAct,
                               access_controls=['change_administrativeact']),
                      MenuItem('file_administrativeactfil_deletion',
-                              _(u"Deletion"),
+                              _("Deletion"),
                               model=AdministrativeAct,
                               access_controls=['change_administrativeact']),
                  ],)]),),
@@ -78,29 +78,29 @@ MENU_SECTIONS = [
 """
     (100,
      SectionItem(
-         'dashboard', _(u"Dashboard"),
+         'dashboard', _("Dashboard"),
          profile_restriction='files',
          css='menu-file',
-         childs=[MenuItem('dashboard_main', _(u"General informations"),
+         childs=[MenuItem('dashboard_main', _("General informations"),
                           model=models.File,
                           access_controls=['change_file', 'change_own_file']),
-                 MenuItem('dashboard_file', _(u"Archaeological files"),
+                 MenuItem('dashboard_file', _("Archaeological files"),
                           model=models.File,
                           access_controls=['change_file', 'change_own_file']),
                  ]),
      ),
-        SectionItem('dashboard', _(u"Dashboard"),
+        SectionItem('dashboard', _("Dashboard"),
             childs=[
-                    MenuItem('dashboard_main', _(u"General informations"),
+                    MenuItem('dashboard_main', _("General informations"),
                         model=models.File,
                         access_controls=['change_file', 'change_own_file']),
-                    MenuItem('dashboard_file', _(u"Archaeological files"),
+                    MenuItem('dashboard_file', _("Archaeological files"),
                         model=models.File,
                         access_controls=['change_file', 'change_own_file']),
-                    #MenuItem('dashboard_treatment', _(u"Treatments"),
+                    #MenuItem('dashboard_treatment', _("Treatments"),
                     #   model=models.Treatment,
                     #    access_controls=['change_treatment',]),
-                    #MenuItem('dashboard_warehouse', _(u"Warehouses"),
+                    #MenuItem('dashboard_warehouse', _("Warehouses"),
                     #    model=models.Warehouse,
                     #    access_controls=['change_warehouse',]),
             ]),
diff --git a/archaeological_files/lookups.py b/archaeological_files/lookups.py
index dab3fb38c..a96974c9f 100644
--- a/archaeological_files/lookups.py
+++ b/archaeological_files/lookups.py
@@ -20,4 +20,4 @@ class FileLookup(LookupChannel):
         return self.model.objects.filter(query).order_by('cached_label')[:20]
 
     def format_item_display(self, item):
-        return u"<span class='ajax-label'>%s</span>" % item.cached_label
+        return "<span class='ajax-label'>%s</span>" % item.cached_label
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)
 
diff --git a/archaeological_files/views.py b/archaeological_files/views.py
index f94de1cb1..dcd1387f9 100644
--- a/archaeological_files/views.py
+++ b/archaeological_files/views.py
@@ -110,7 +110,7 @@ def dashboard_file(request, *args, **kwargs):
 
 file_search_wizard = wizards.FileSearch.as_view(
     [('general-file_search', forms.FileFormSelection)],
-    label=_(u"File search"), url_name='file_search',)
+    label=_("File search"), url_name='file_search',)
 
 file_creation_wizard = wizards.FileWizard.as_view(
     [('general-file_creation', forms.FileFormGeneral),
@@ -119,7 +119,7 @@ file_creation_wizard = wizards.FileWizard.as_view(
      ('preventive-file_creation', forms.FileFormPreventive),
      ('research-file_creation', forms.FileFormResearch),
      ('final-file_creation', forms.FinalForm)],
-    label=_(u"New file"),
+    label=_("New file"),
     condition_dict={
         'preventive-file_creation':
             is_preventive('general-file_creation', models.FileType,
@@ -138,7 +138,7 @@ file_modification_wizard = wizards.FileModificationWizard.as_view(
      ('preventive-file_modification', forms.FileFormPreventive),
      ('research-file_modification', forms.FileFormResearch),
      ('final-file_modification', forms.FinalForm)],
-    label=_(u"File modification"),
+    label=_("File modification"),
     condition_dict={
         'preventive-file_modification':
             is_preventive('general-file_modification',
@@ -164,12 +164,12 @@ file_closing_wizard = wizards.FileClosingWizard.as_view(
     [('selec-file_closing', forms.FileFormSelection),
      ('date-file_closing', ClosingDateFormSelection),
      ('final-file_closing', forms.FinalFileClosingForm)],
-    label=_(u"File closing"), url_name='file_closing',)
+    label=_("File closing"), url_name='file_closing',)
 
 file_deletion_wizard = wizards.FileDeletionWizard.as_view(
     [('selec-file_deletion', forms.FileFormMultiSelection),
      ('final-file_deletion', forms.FinalFileDeleteForm)],
-    label=_(u"File deletion"),
+    label=_("File deletion"),
     url_name='file_deletion',)
 
 
@@ -186,7 +186,7 @@ file_administrativeactfile_search_wizard = \
     SearchWizard.as_view([
         ('selec-file_administrativeactfile_search',
         forms.AdministrativeActFileFormSelection)],
-        label=_(u"File: search administrative act"),
+        label=_("File: search administrative act"),
         url_name='file_administrativeactfile_search',)
 
 file_administrativeactfile_wizard = \
@@ -195,7 +195,7 @@ file_administrativeactfile_wizard = \
         ('administrativeact-file_administrativeactfile',
          forms.AdministrativeActFileForm),
         ('final-file_administrativeactfile', forms.FinalForm)],
-        label=_(u"File: new administrative act"),
+        label=_("File: new administrative act"),
         url_name='file_administrativeactfile',)
 
 file_administrativeactfile_modification_wizard = \
@@ -205,7 +205,7 @@ file_administrativeactfile_modification_wizard = \
         ('administrativeact-file_administrativeactfile_modification',
          forms.AdministrativeActFileModifForm),
         ('final-file_administrativeactfile_modification', forms.FinalForm)],
-        label=_(u"File: administrative act modification"),
+        label=_("File: administrative act modification"),
         url_name='file_administrativeactfile_modification',)
 
 
@@ -231,7 +231,7 @@ file_administrativeactfile_deletion_wizard = \
          forms.AdministrativeActFileFormSelection),
         ('final-file_administrativeactfile_deletion',
          FinalAdministrativeActDeleteForm)],
-        label=_(u"File: administrative act deletion"),
+        label=_("File: administrative act deletion"),
         url_name='file_administrativeactfile_deletion',)
 
 
diff --git a/archaeological_files/wizards.py b/archaeological_files/wizards.py
index c208dc097..c259effbe 100644
--- a/archaeological_files/wizards.py
+++ b/archaeological_files/wizards.py
@@ -145,7 +145,7 @@ class FileAdministrativeActWizard(OperationAdministrativeActWizard):
             file_id = self.session_get_value(form_key, "pk")
             try:
                 return (
-                    (_(u"Archaeological file"),
+                    (_("Archaeological file"),
                      str(models.File.objects.get(pk=file_id))),)
             except models.File.DoesNotExist:
                 return
@@ -155,7 +155,7 @@ class FileAdministrativeActWizard(OperationAdministrativeActWizard):
                 admin = AdministrativeAct.objects.get(pk=admin_id)
                 if not admin.associated_file:
                     return
-                return ((_(u"Archaeological file"),
+                return ((_("Archaeological file"),
                          str(admin.associated_file)),)
             except AdministrativeAct.DoesNotExist:
                 return