Migrate to python 3 - Clean old migrations and some old scripts

1 files changed, 26 insertions, 26 deletions

diff --git a/archaeological_files/models.py b/archaeological_files/models.py
index 8794be6ad..42951bdee 100644
--- a/archaeological_files/models.py
+++ b/archaeological_files/models.py
@@ -141,63 +141,63 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, OwnPerms, ValueGetter,
     # alternative names of fields for searches
     ALT_NAMES = {
         'year': SearchAltName(
-            pgettext_lazy("key for text search", u"year"),
+            pgettext_lazy("key for text search", "year"),
             'year'
         ),
         'numeric_reference': SearchAltName(
-            pgettext_lazy("key for text search", u"reference"),
+            pgettext_lazy("key for text search", "reference"),
             'numeric_reference'
         ),
         'internal_reference': SearchAltName(
-            pgettext_lazy("key for text search", u"other-reference"),
+            pgettext_lazy("key for text search", "other-reference"),
             'internal_reference__iexact'
         ),
         'towns': SearchAltName(
-            pgettext_lazy("key for text search", u"town"),
+            pgettext_lazy("key for text search", "town"),
             'towns__cached_label__iexact'
         ),
         'parcel': SearchAltName(
-            pgettext_lazy("key for text search", u"parcel"),
+            pgettext_lazy("key for text search", "parcel"),
             'parcels__cached_label__iexact'
         ),
         'towns__numero_insee__startswith': SearchAltName(
-            pgettext_lazy("key for text search", u"department"),
+            pgettext_lazy("key for text search", "department"),
             'towns__numero_insee__startswith'
         ),
         'name': SearchAltName(
-            pgettext_lazy("key for text search", u"name"),
+            pgettext_lazy("key for text search", "name"),
             'name__iexact'
         ),
         'file_type': SearchAltName(
-            pgettext_lazy("key for text search", u"type"),
+            pgettext_lazy("key for text search", "type"),
             'file_type__label__iexact'
         ),
         'end_date': SearchAltName(
-            pgettext_lazy("key for text search", u"active"),
+            pgettext_lazy("key for text search", "active"),
             'end_date__isnull'
         ),
         'saisine_type': SearchAltName(
-            pgettext_lazy("key for text search", u"saisine-type"),
+            pgettext_lazy("key for text search", "saisine-type"),
             'saisine_type__label__iexact'
         ),
         'permit_type': SearchAltName(
-            pgettext_lazy("key for text search", u"permit-type"),
+            pgettext_lazy("key for text search", "permit-type"),
             'permit_type__label__iexact'
         ),
         'permit_reference': SearchAltName(
-            pgettext_lazy("key for text search", u"permit-reference"),
+            pgettext_lazy("key for text search", "permit-reference"),
             'permit_reference__iexact'
         ),
         'comment': SearchAltName(
-            pgettext_lazy("key for text search", u"comment"),
+            pgettext_lazy("key for text search", "comment"),
             'comment__iexact'
         ),
         'in_charge': SearchAltName(
-            pgettext_lazy("key for text search", u"in-charge"),
+            pgettext_lazy("key for text search", "in-charge"),
             'in_charge__cached_label__iexact'
         ),
         'general_contractor': SearchAltName(
-            pgettext_lazy("key for text search", u"general-contractor"),
+            pgettext_lazy("key for text search", "general-contractor"),
             'general_contractor__cached_label__iexact'
         ),
         'general_contractor__attached_to': SearchAltName(
@@ -414,7 +414,7 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, OwnPerms, ValueGetter,
         if self.general_contractor:
             if self.general_contractor.name:
                 address = u" ".join([
-                    unicode(getattr(self.general_contractor, key))
+                    str(getattr(self.general_contractor, key))
                     for key in ('title', 'surname', 'name')
                     if getattr(self.general_contractor, key)])
             elif self.general_contractor.raw_name:
@@ -525,7 +525,7 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, OwnPerms, ValueGetter,
         from archaeological_operations.models import Parcel
         return Parcel.render_parcels(list(self.parcels.all()))
 
-    def __unicode__(self):
+    def __str__(self):
         if self.cached_label:
             return self.cached_label
         self.save()
@@ -533,7 +533,7 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, OwnPerms, ValueGetter,
 
     @property
     def short_label(self):
-        return settings.JOINT.join(unicode(self).split(settings.JOINT)[1:])
+        return settings.JOINT.join(str(self).split(settings.JOINT)[1:])
 
     @property
     def reference(self):
@@ -541,7 +541,7 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, OwnPerms, ValueGetter,
 
     def _generate_cached_label(self):
         items = [self.get_town_label(), self.reference]
-        items += [unicode(getattr(self, k))
+        items += [str(getattr(self, k))
                   for k in ['internal_reference', 'name'] if getattr(self, k)]
         return settings.JOINT.join(items)
 
@@ -550,13 +550,13 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, OwnPerms, ValueGetter,
         return Parcel.grouped_parcels(list(self.parcels.all()))
 
     def get_town_label(self):
-        lbl = unicode(_(u'Multi-town'))
+        lbl = str(_(u'Multi-town'))
         if self.main_town:
             lbl = self.main_town.name
         elif self.towns.count() == 1:
             lbl = self.towns.all()[0].name
         elif self.towns.count() == 0:
-            lbl = unicode(_(u"No town"))
+            lbl = str(_(u"No town"))
         return lbl
 
     def get_department(self):
@@ -593,7 +593,7 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, OwnPerms, ValueGetter,
 
     @property
     def town_list(self):
-        return u", ".join([unicode(tw) for tw in self.towns.all()])
+        return u", ".join([str(tw) for tw in self.towns.all()])
 
     def total_surface_ha(self):
         if self.total_surface:
@@ -618,7 +618,7 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, OwnPerms, ValueGetter,
         current_lbl = ""
         if self.raw_town_planning_service:
             current_lbl = self.raw_town_planning_service[:]
-        lbl = unicode(self.responsible_town_planning_service)
+        lbl = str(self.responsible_town_planning_service)
         if not lbl:
             return False
         self.raw_town_planning_service = lbl[:200]
@@ -651,7 +651,7 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, OwnPerms, ValueGetter,
         current_lbl = ""
         if self.raw_general_contractor:
             current_lbl = self.raw_general_contractor[:]
-        lbl = unicode(self.general_contractor)
+        lbl = str(self.general_contractor)
         if not lbl:
             return False
         self.raw_general_contractor = lbl[:200]
@@ -737,8 +737,8 @@ class FileByDepartment(models.Model):
         managed = False
         db_table = 'file_department'
 
-    def __unicode__(self):
-        return u"{} - {}".format(self.file, self.department)
+    def __str__(self):
+        return "{} - {}".format(self.file, self.department)
 
 
 class FileDashboard: