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

1 files changed, 9 insertions, 10 deletions

diff --git a/archaeological_finds/wizards.py b/archaeological_finds/wizards.py
index 7f4e1b498..42a1e603a 100644
--- a/archaeological_finds/wizards.py
+++ b/archaeological_finds/wizards.py
@@ -27,7 +27,7 @@ from archaeological_operations.wizards import OperationAdministrativeActWizard
 
 from archaeological_operations.models import AdministrativeAct
 from archaeological_context_records.models import ContextRecord
-import models
+from . import models
 
 
 class FindSearch(SearchWizard):
@@ -82,8 +82,8 @@ class FindWizard(Wizard):
         if not current_cr or self.steps.current.startswith('select-'):
             return context
         context['reminders'] = (
-            (_(u"Operation"), unicode(current_cr.operation)),
-            (_(u"Context record"), unicode(current_cr)))
+            (_(u"Operation"), str(current_cr.operation)),
+            (_(u"Context record"), str(current_cr)))
         return context
 
     def get_extra_model(self, dct, m2m, form_list):
@@ -314,7 +314,7 @@ class TreatmentN1Wizard(TreatmentBase):
         # manage upstream items
         pks = dct.pop('resulting_pk')
         if hasattr(pks, 'split'):
-            pks = pks.split(u',')  # unicode or string
+            pks = pks.split(',')  # string
         for pk in pks:
             try:
                 find = models.Find.objects.get(pk=pk)
@@ -357,7 +357,7 @@ class Treatment1NWizard(TreatmentBase):
         if not finds:
             return initial
         lbl = finds[0].label
-        initial['resultings_basket_name'] = unicode(_(u"Basket")) + u" - " + lbl
+        initial['resultings_basket_name'] = str(_(u"Basket")) + u" - " + lbl
         initial['resultings_label'] = lbl + u"-"
         return initial
 
@@ -391,12 +391,12 @@ class Treatment1NWizard(TreatmentBase):
                 ] = dct.pop(k)
         messages.add_message(
             self.request, messages.INFO,
-            unicode(_(u"The new basket: \"{}\" have been created with the "
+            str(_(u"The new basket: \"{}\" have been created with the "
                       u"resulting items. This search have been pinned.")
                     ).format(dct["resulting_finds"]["basket_name"])
         )
         self.request.session["pin-search-find"] = u'{}="{}"'.format(
-            unicode(pgettext("key for text search", u"basket")),
+            str(pgettext("key for text search", u"basket")),
             dct["resulting_finds"]["basket_name"])
         self.request.session['find'] = ''
         return dct
@@ -463,7 +463,7 @@ class TreatmentFileAdministrativeActWizard(
             try:
                 return (
                     (_(u"Treatment request"),
-                     unicode(models.TreatmentFile.objects.get(pk=pk))),
+                     str(models.TreatmentFile.objects.get(pk=pk))),
                 )
             except models.TreatmentFile.DoesNotExist:
                 return
@@ -474,11 +474,10 @@ class TreatmentFileAdministrativeActWizard(
                 if not admin.operation:
                     return
                 return (
-                    (_(u"Operation"), unicode(admin.operation)),
+                    (_(u"Operation"), str(admin.operation)),
                 )
             except AdministrativeAct.DoesNotExist:
                 return
-        return
 
 
 class TreatmentFileEditAdministrativeActWizard(