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

1 files changed, 24 insertions, 24 deletions

diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py
index 84855180a..fb5143c7f 100644
--- a/archaeological_finds/models_treatments.py
+++ b/archaeological_finds/models_treatments.py
@@ -95,27 +95,27 @@ class Treatment(DashboardFormItem, ValueGetter, DocumentItem,
     # alternative names of fields for searches
     ALT_NAMES = {
         'label': SearchAltName(
-            pgettext_lazy("key for text search", u"label"),
+            pgettext_lazy("key for text search", "label"),
             'label__iexact'
         ),
         'other_reference': SearchAltName(
-            pgettext_lazy("key for text search", u"other-reference"),
+            pgettext_lazy("key for text search", "other-reference"),
             'other_reference__iexact'
         ),
         'year': SearchAltName(
-            pgettext_lazy("key for text search", u"year"),
+            pgettext_lazy("key for text search", "year"),
             'year'
         ),
         'index': SearchAltName(
-            pgettext_lazy("key for text search", u"index"),
+            pgettext_lazy("key for text search", "index"),
             'index'
         ),
         'documents__image__isnull': SearchAltName(
-            pgettext_lazy("key for text search", u"has-image"),
+            pgettext_lazy("key for text search", "has-image"),
             'documents__image__isnull'
         ),
         'treatment_types': SearchAltName(
-            pgettext_lazy("key for text search", u"type"),
+            pgettext_lazy("key for text search", "type"),
             'treatment_types__label__iexact'
         ),
     }
@@ -218,7 +218,7 @@ class Treatment(DashboardFormItem, ValueGetter, DocumentItem,
         )
         ordering = ("-year", "-index", "-start_date")
 
-    def __unicode__(self):
+    def __str__(self):
         if self.cached_label:
             return self.cached_label
         self.skip_history_when_saving = True
@@ -267,7 +267,7 @@ class Treatment(DashboardFormItem, ValueGetter, DocumentItem,
             context_record__base_finds__find__downstream_treatment=self)
 
     def _generate_cached_label(self):
-        items = [unicode(getattr(self, k))
+        items = [str(getattr(self, k))
                  for k in ['year', 'index', 'other_reference', 'label'] if
                  getattr(self, k)]
         return u'{} | {}'.format(u"-".join(items), self.treatment_types_lbl())
@@ -280,7 +280,7 @@ class Treatment(DashboardFormItem, ValueGetter, DocumentItem,
         Treatment types label
         :return: string
         """
-        return u" ; ".join([unicode(t) for t in self.treatment_types.all()])
+        return u" ; ".join([str(t) for t in self.treatment_types.all()])
     treatment_types_lbl.short_description = _(u"Treatment types")
     treatment_types_lbl.admin_order_field = 'treatment_types__label'
 
@@ -317,11 +317,11 @@ class Treatment(DashboardFormItem, ValueGetter, DocumentItem,
         values = super(Treatment, self).get_values(prefix=prefix,
                                                    no_values=no_values)
         values[prefix + "upstream_finds"] = u" ; ".join(
-            [unicode(up) for up in self.upstream.all()])
+            [str(up) for up in self.upstream.all()])
         values[prefix + "downstream_finds"] = u" ; ".join(
-            [unicode(down) for down in self.downstream.all()])
+            [str(down) for down in self.downstream.all()])
         values[prefix + "operations"] = u" ; ".join(
-            [unicode(ope) for ope in self.get_query_operations().all()])
+            [str(ope) for ope in self.get_query_operations().all()])
         if self.upstream.count():
             find = self.upstream.all()[0]
             if 'associatedfind_' not in prefix:
@@ -422,7 +422,7 @@ class Treatment(DashboardFormItem, ValueGetter, DocumentItem,
         new_items = []
         start_number = resulting_finds['start_number']
         for idx in range(resulting_finds['number']):
-            label = resulting_finds['label'] + unicode(start_number + idx)
+            label = resulting_finds['label'] + str(start_number + idx)
             new_find = Find.objects.get(
                 pk=upstream_item.pk).duplicate(user)
             new_find.upstream_treatment = self
@@ -647,7 +647,7 @@ class AbsFindTreatments(models.Model):
     class Meta:
         abstract = True
 
-    def __unicode__(self):
+    def __str__(self):
         return u"{} - {} [{}]".format(
             self.find, self.treatment, self.treatment_nb)
 
@@ -897,35 +897,35 @@ class TreatmentFile(DashboardFormItem, ClosedItem, DocumentItem,
     # alternative names of fields for searches
     ALT_NAMES = {
         'name': SearchAltName(
-            pgettext_lazy("key for text search", u"name"),
+            pgettext_lazy("key for text search", "name"),
             'name__iexact'
         ),
         'internal_reference': SearchAltName(
-            pgettext_lazy("key for text search", u"reference"),
+            pgettext_lazy("key for text search", "reference"),
             'internal_reference__iexact'
         ),
         'year': SearchAltName(
-            pgettext_lazy("key for text search", u"year"),
+            pgettext_lazy("key for text search", "year"),
             'year'
         ),
         'index': SearchAltName(
-            pgettext_lazy("key for text search", u"index"),
+            pgettext_lazy("key for text search", "index"),
             'index'
         ),
         'type': SearchAltName(
-            pgettext_lazy("key for text search", u"type"),
+            pgettext_lazy("key for text search", "type"),
             'type__label__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'
         ),
         'applicant': SearchAltName(
-            pgettext_lazy("key for text search", u"applicant"),
+            pgettext_lazy("key for text search", "applicant"),
             'applicant__cached_label__iexact'
         ),
         'applicant_organisation': SearchAltName(
-            pgettext_lazy("key for text search", u"applicant-organisation"),
+            pgettext_lazy("key for text search", "applicant-organisation"),
             'applicant_organisation__cached_label__iexact'
         ),
     }
@@ -993,7 +993,7 @@ class TreatmentFile(DashboardFormItem, ClosedItem, DocumentItem,
         )
         ordering = ('cached_label',)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.cached_label
 
     @property
@@ -1045,7 +1045,7 @@ class TreatmentFile(DashboardFormItem, ClosedItem, DocumentItem,
         return cls._return_get_owns(owns, values, get_short_menu_class)
 
     def _generate_cached_label(self):
-        items = [unicode(getattr(self, k))
+        items = [str(getattr(self, k))
                  for k in ['year', 'index', 'internal_reference', 'name'] if
                  getattr(self, k)]
         return settings.JOINT.join(items)