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

1 files changed, 134 insertions, 144 deletions

diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 76d5fb97a..011e10df1 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -327,7 +327,7 @@ class BaseFind(BulkUpdatedItem, BaseHistorizedItem, GeoItem, OwnPerms,
             ("delete_own_basefind", u"Can delete own Base find"),
         )
 
-    def __unicode__(self):
+    def __str__(self):
         return self.label
 
     def natural_key(self):
@@ -414,8 +414,8 @@ class BaseFind(BulkUpdatedItem, BaseHistorizedItem, GeoItem, OwnPerms,
         elif ope.year and ope.operation_code:
             c_id.append(
                 profile.default_operation_prefix +
-                unicode(ope.year or '') + u"-" +
-                unicode(ope.operation_code or ''))
+                str(ope.year or '') + u"-" +
+                str(ope.operation_code or ''))
         else:
             c_id.append('')
         return settings.JOINT.join(c_id)
@@ -464,8 +464,8 @@ class BaseFind(BulkUpdatedItem, BaseHistorizedItem, GeoItem, OwnPerms,
         finds = [find and find.material_type.code or '']
         ope = self.context_record.operation
         finds += [ope.code_patriarche or
-                  (unicode(ope.year) + "-" + ope.operation_code)]
-        finds += [self.context_record.label, unicode(self.material_index)]
+                  (str(ope.year) + "-" + ope.operation_code)]
+        finds += [self.context_record.label, str(self.material_index)]
         return settings.JOINT.join(finds)
 
     def _real_label(self):
@@ -486,7 +486,7 @@ class BaseFind(BulkUpdatedItem, BaseHistorizedItem, GeoItem, OwnPerms,
         find = self.get_last_find()
         lbl = find.label or self.label
         return settings.JOINT.join(
-            [unicode(it) for it in (
+            [str(it) for it in (
                 self.context_record.parcel.year, self.index,
                 self.context_record.label, lbl) if it])
 
@@ -857,452 +857,442 @@ class Find(BulkUpdatedItem, ValueGetter, DocumentItem, BaseHistorizedItem,
         'container__index': 'container__index',
         'container__reference': 'container__reference',
     }
-    EXTRA_REQUEST_KEYS.update(
-        dict(
-            [(key, key) for key in TABLE_COLS
-             if key not in EXTRA_REQUEST_KEYS]
-        )
-    )
-    EXTRA_REQUEST_KEYS.update(
-        dict(
-            [(key, key) for key in TABLE_COLS_FOR_OPE
-             if key not in EXTRA_REQUEST_KEYS]
-        )
-    )
+    for table in (TABLE_COLS, TABLE_COLS_FOR_OPE):
+        for key in table:
+            if key not in EXTRA_REQUEST_KEYS.keys():
+                EXTRA_REQUEST_KEYS[key] = key
 
     # alternative names of fields for searches
     ALT_NAMES = {
         'base_finds__cache_short_id':
-            SearchAltName(pgettext_lazy("key for text search", u"short-id"),
+            SearchAltName(pgettext_lazy("key for text search", "short-id"),
                           'base_finds__cache_short_id__iexact'),
         'base_finds__cache_complete_id':
-            SearchAltName(pgettext_lazy("key for text search", u"complete-id"),
+            SearchAltName(pgettext_lazy("key for text search", "complete-id"),
                           'base_finds__cache_complete_id__iexact'),
         'label':
-            SearchAltName(pgettext_lazy("key for text search", u"free-id"),
+            SearchAltName(pgettext_lazy("key for text search", "free-id"),
                           'label__iexact'),
         'denomination':
-            SearchAltName(pgettext_lazy("key for text search", u"denomination"),
+            SearchAltName(pgettext_lazy("key for text search", "denomination"),
                                         'denomination__iexact'),
         'base_finds__context_record__town':
             SearchAltName(
-                pgettext_lazy("key for text search", u"town"),
+                pgettext_lazy("key for text search", "town"),
                 'base_finds__context_record__town__cached_label__iexact'),
         'base_finds__context_record__operation__year':
-            SearchAltName(pgettext_lazy("key for text search", u"year"),
+            SearchAltName(pgettext_lazy("key for text search", "year"),
                           'base_finds__context_record__operation__year'),
         'base_finds__context_record__operation__operation_code':
             SearchAltName(
-                pgettext_lazy("key for text search", u"operation-code"),
+                pgettext_lazy("key for text search", "operation-code"),
                 'base_finds__context_record__operation__operation_code'),
         'base_finds__context_record__operation__code_patriarche':
             SearchAltName(
-                pgettext_lazy("key for text search", u"code-patriarche"),
+                pgettext_lazy("key for text search", "code-patriarche"),
                 'base_finds__context_record__operation__code_patriarche__iexact'
             ),
         'base_finds__context_record__operation__operation_type':
             SearchAltName(
-                pgettext_lazy("key for text search", u"operation-type"),
+                pgettext_lazy("key for text search", "operation-type"),
                 'base_finds__context_record__operation__operation_type'
                 '__label__iexact'),
         'base_finds__context_record__town__areas':
             SearchAltName(
-                pgettext_lazy("key for text search", u"area"),
+                pgettext_lazy("key for text search", "area"),
                 'base_finds__context_record__town__areas__label__iexact'),
         'archaeological_sites':
             SearchAltName(
-                pgettext_lazy("key for text search", u"site"),
+                pgettext_lazy("key for text search", "site"),
                 'base_finds__context_record__operation__archaeological_sites__'
                 'cached_label__icontains'),
         'archaeological_sites_name':
             SearchAltName(
-                pgettext_lazy("key for text search", u"site-name"),
+                pgettext_lazy("key for text search", "site-name"),
                 'base_finds__context_record__operation__archaeological_sites__'
                 'name__iexact'),
         'archaeological_sites_context_record':
             SearchAltName(
-                pgettext_lazy("key for text search", u"context-record-site"),
+                pgettext_lazy("key for text search", "context-record-site"),
                 'base_finds__context_record__archaeological_site__'
                 'cached_label__icontains'),
         'archaeological_sites_context_record_name':
             SearchAltName(
                 pgettext_lazy("key for text search",
-                              u"context-record-site-name"),
+                              "context-record-site-name"),
                 'base_finds__context_record__archaeological_site__'
                 'name__iexact'),
         'base_finds__context_record':
             SearchAltName(
-                pgettext_lazy("key for text search", u"context-record"),
+                pgettext_lazy("key for text search", "context-record"),
                 'base_finds__context_record__cached_label__icontains'),
         'ope_relation_types':
             SearchAltName(
-                pgettext_lazy("key for text search",
-                              u"operation-relation-type"),
+                pgettext_lazy("key for text search", "operation-relation-type"),
                 'ope_relation_types'),
         'cr_relation_types':
             SearchAltName(
                 pgettext_lazy("key for text search",
-                              u"context-record-relation-type"),
+                              "context-record-relation-type"),
                 'cr_relation_types'),
         'datings__period':
             SearchAltName(
-                pgettext_lazy("key for text search", u"period"),
+                pgettext_lazy("key for text search", "period"),
                 'datings__period__label__iexact'),
         'material_types':
             SearchAltName(
-                pgettext_lazy("key for text search", u"material"),
+                pgettext_lazy("key for text search", "material"),
                 'material_types__label__iexact'),
         'object_types':
             SearchAltName(
-                pgettext_lazy("key for text search", u"object-type"),
+                pgettext_lazy("key for text search", "object-type"),
                 'object_types__label__iexact'),
         'preservation_to_considers':
             SearchAltName(
-                pgettext_lazy("key for text search", u"preservation"),
+                pgettext_lazy("key for text search", "preservation"),
                 'preservation_to_considers__label__iexact'),
         'conservatory_state':
             SearchAltName(
-                pgettext_lazy("key for text search", u"conservatory"),
+                pgettext_lazy("key for text search", "conservatory"),
                 'conservatory_state__label__iexact'),
         'integrities':
             SearchAltName(
-                pgettext_lazy("key for text search", u"integrity"),
+                pgettext_lazy("key for text search", "integrity"),
                 'integrities__label__iexact'),
         'remarkabilities':
             SearchAltName(
-                pgettext_lazy("key for text search", u"remarkability"),
+                pgettext_lazy("key for text search", "remarkability"),
                 'remarkabilities__label__iexact'),
         'description':
             SearchAltName(
-                pgettext_lazy("key for text search", u"description"),
+                pgettext_lazy("key for text search", "description"),
                 'description__iexact'),
         'base_finds__batch':
             SearchAltName(
-                pgettext_lazy("key for text search", u"batch"),
+                pgettext_lazy("key for text search", "batch"),
                 'base_finds__batch__label__iexact'),
         'checked_type':
             SearchAltName(
-                pgettext_lazy("key for text search", u"checked"),
+                pgettext_lazy("key for text search", "checked"),
                 'checked_type__label__iexact'),
         'documents__image__isnull':
             SearchAltName(
-                pgettext_lazy("key for text search", u"has-image"),
+                pgettext_lazy("key for text search", "has-image"),
                 'documents__image__isnull'),
         'container_ref__location':
             SearchAltName(
-                pgettext_lazy("key for text search", u"location"),
+                pgettext_lazy("key for text search", "location"),
                 'container_ref__location__name__iexact'),
         'container_ref__responsible':
             SearchAltName(
-                pgettext_lazy("key for text search", u"warehouse"),
+                pgettext_lazy("key for text search", "warehouse"),
                 'container_ref__responsible__name__iexact'),
         'container_ref__index':
             SearchAltName(
-                pgettext_lazy("key for text search", u"container-index"),
+                pgettext_lazy("key for text search", "container-index"),
                 'container_ref__index'),
         'container_ref__reference':
             SearchAltName(
-                pgettext_lazy("key for text search", u"container-ref"),
+                pgettext_lazy("key for text search", "container-ref"),
                 'container_ref__reference__iexact'),
         'container__location':
             SearchAltName(
-                pgettext_lazy("key for text search", u"current-location"),
+                pgettext_lazy("key for text search", "current-location"),
                 'container__location__name__iexact'),
         'container__responsible':
             SearchAltName(
-                pgettext_lazy("key for text search", u"current-warehouse"),
+                pgettext_lazy("key for text search", "current-warehouse"),
                 'container__responsible__name__iexact'),
         'container__index':
             SearchAltName(
-                pgettext_lazy("key for text search",
-                              u"current-container-index"),
+                pgettext_lazy("key for text search", "current-container-index"),
                 'container__index'),
         'container__reference':
             SearchAltName(
-                pgettext_lazy("key for text search", u"current-container-ref"),
+                pgettext_lazy("key for text search", "current-container-ref"),
                 'container__reference__iexact'),
         'basket':
             SearchAltName(
-                pgettext_lazy("key for text search", u"basket"),
+                pgettext_lazy("key for text search", "basket"),
                 'basket__label__iexact'),
         'base_finds__context_record__operation__cached_label':
             SearchAltName(
-                pgettext_lazy("key for text search", u"operation"),
+                pgettext_lazy("key for text search", "operation"),
                 'base_finds__context_record__operation__cached_label__icontains'
             ),
         'history_modifier':
             SearchAltName(
-                pgettext_lazy("key for text search", u"last-modified-by"),
+                pgettext_lazy("key for text search", "last-modified-by"),
                 'history_modifier__ishtaruser__person__cached_label__icontains'
             ),
         'modified_since':
             SearchAltName(
-                pgettext_lazy("key for text search", u"modified-since"),
+                pgettext_lazy("key for text search", "modified-since"),
                 'last_modified__gte'),
         'history_creator':
             SearchAltName(
-                pgettext_lazy("key for text search", u"created-by"),
+                pgettext_lazy("key for text search", "created-by"),
                 'history_creator__ishtaruser__person__cached_label__iexact'
         ),
         'loan':
             SearchAltName(
-                pgettext_lazy("key for text search", u"loan"), query_loan),
+                pgettext_lazy("key for text search", "loan"), query_loan),
         'treatments_file_end_date':
             SearchAltName(
                 pgettext_lazy("key for text search",
-                              u"treatment-end-date-before"),
+                              "treatment-end-date-before"),
                 'treatments__file__end_date__lte'),
         'previous_id':
             SearchAltName(
-                pgettext_lazy("key for text search", u"previous-id"),
+                pgettext_lazy("key for text search", "previous-id"),
                 'previous_id__iexact'),
         'seal_number':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"seal-number"),
+                pgettext_lazy("key for text search", "seal-number"),
                 'seal_number__iexact'),
         'base_finds__excavation_id':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"excavation-id"),
+                pgettext_lazy("key for text search", "excavation-id"),
                 'base_finds__excavation_id__iexact'),
         'museum_id':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"museum-id"),
+                pgettext_lazy("key for text search", "museum-id"),
                 'museum_id__iexact'),
         'mark':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"mark"),
+                pgettext_lazy("key for text search", "mark"),
                 'mark__iexact'),
         'base_finds__discovery_date__before':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"discovery-date-before"),
+                pgettext_lazy("key for text search", "discovery-date-before"),
                 'base_finds__discovery_date__lte'),
         'base_finds__discovery_date__after':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"discovery-date-after"),
+                pgettext_lazy("key for text search", "discovery-date-after"),
                 'base_finds__discovery_date__gte'),
         'base_finds__discovery_date_tpq__before':
             SearchAltName(
-                pgettext_lazy(u"key for text search",
-                              u"discovery-date-tpq-before"),
+                pgettext_lazy("key for text search",
+                              "discovery-date-tpq-before"),
                 'base_finds__discovery_date_tpq__lte'),
         'base_finds__discovery_date_tpq__after':
             SearchAltName(
-                pgettext_lazy(u"key for text search",
-                              u"discovery-date-tpq-after"),
+                pgettext_lazy("key for text search",
+                              "discovery-date-tpq-after"),
                 'base_finds__discovery_date_tpq__gte'),
         'base_finds__discovery_date_taq__before':
             SearchAltName(
-                pgettext_lazy(u"key for text search",
-                              u"discovery-date-taq-before"),
+                pgettext_lazy("key for text search",
+                              "discovery-date-taq-before"),
                 'base_finds__discovery_date_taq__lte'),
         'base_finds__discovery_date_taq__after':
             SearchAltName(
-                pgettext_lazy(u"key for text search",
-                              u"discovery-date-taq-after"),
+                pgettext_lazy("key for text search",
+                              "discovery-date-taq-after"),
                 'base_finds__discovery_date_taq__gte'),
         'is_complete':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"is-complete"),
+                pgettext_lazy("key for text search", "is-complete"),
                 'is_complete'),
         'material_type_quality':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"material-type-quality"),
+                pgettext_lazy("key for text search", "material-type-quality"),
                 'material_type_quality__label__iexact'),
         'object_type_quality':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"object-type-quality"),
+                pgettext_lazy("key for text search", "object-type-quality"),
                 'object_type_quality__label__iexact'),
         'find_number':
         SearchAltName(
-                pgettext_lazy(u"key for text search", u"find-number"),
+                pgettext_lazy("key for text search", "find-number"),
                 'find_number'),
         'min_number_of_individuals':
             SearchAltName(
-               pgettext_lazy(u"key for text search",
-                             u"min-number-of-individuals"),
+               pgettext_lazy("key for text search",
+                             "min-number-of-individuals"),
                'min_number_of_individuals'),
         'decoration':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"decoration"),
+                pgettext_lazy("key for text search", "decoration"),
                 'decoration__iexact'),
         'inscription':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"inscription"),
+                pgettext_lazy("key for text search", "inscription"),
                 'inscription__iexact'),
         'manufacturing_place':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"manufacturing-place"),
+                pgettext_lazy("key for text search", "manufacturing-place"),
                 'manufacturing_place__iexact'),
         'communicabilities':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"communicabilities"),
+                pgettext_lazy("key for text search", "communicabilities"),
                 'communicabilities__label__iexact'),
         'comment':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"comment"),
+                pgettext_lazy("key for text search", "comment"),
                 'comment__iexact'),
         'material_comment':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"material-comment"),
+                pgettext_lazy("key for text search", "material-comment"),
                 'material_comment__iexact'),
         'dating_comment':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"dating-comment"),
+                pgettext_lazy("key for text search", "dating-comment"),
                 'dating_comment__iexact'),
         'length__lower':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"length-lower"),
+                pgettext_lazy("key for text search", "length-lower"),
                 'length__lte'),
         'width__lower':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"width-lower"),
+                pgettext_lazy("key for text search", "width-lower"),
                 'width__lte'),
         'height__lower':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"height-lower"),
+                pgettext_lazy("key for text search", "height-lower"),
                 'height__lte'),
         'thickness__lower':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"thickness-lower"),
+                pgettext_lazy("key for text search", "thickness-lower"),
                 'thickness__lte'),
         'diameter__lower':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"diameter-lower"),
+                pgettext_lazy("key for text search", "diameter-lower"),
                 'diameter__lte'),
         'circumference__lower':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"circumference-lower"),
+                pgettext_lazy("key for text search", "circumference-lower"),
                 'circumference__lte'),
         'volume__lower':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"volume-lower"),
+                pgettext_lazy("key for text search", "volume-lower"),
                 'volume__lte'),
         'weight__lower':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"weight-lower"),
+                pgettext_lazy("key for text search", "weight-lower"),
                 'weight__lte'),
         'clutter_long_side__lower':
             SearchAltName(
-                pgettext_lazy(u"key for text search",
-                              u"clutter-long-side-lower"),
+                pgettext_lazy("key for text search",
+                              "clutter-long-side-lower"),
                 'clutter_long_side__lte'),
         'clutter_short_side__lower':
             SearchAltName(
-                pgettext_lazy(u"key for text search",
-                              u"clutter-short-side-lower"),
+                pgettext_lazy("key for text search",
+                              "clutter-short-side-lower"),
                 'clutter_short_side__lte'),
         'clutter_height__lower':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"clutter-height-lower"),
+                pgettext_lazy("key for text search", "clutter-height-lower"),
                 'clutter_height__lte'),
         'length__higher':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"length-higher"),
+                pgettext_lazy("key for text search", "length-higher"),
                 'length__gte'),
         'width__higher':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"width-higher"),
+                pgettext_lazy("key for text search", "width-higher"),
                 'width__gte'),
         'height__higher':
             SearchAltName(
-                 pgettext_lazy(u"key for text search", u"height-higher"),
+                 pgettext_lazy("key for text search", "height-higher"),
                  'height__gte'),
         'thickness__higher':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"thickness-higher"),
+                pgettext_lazy("key for text search", "thickness-higher"),
                 'thickness__gte'),
         'diameter__higher':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"diameter-higher"),
+                pgettext_lazy("key for text search", "diameter-higher"),
                 'diameter__gte'),
         'circumference__higher':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"circumference-higher"),
+                pgettext_lazy("key for text search", "circumference-higher"),
                 'circumference__gte'),
         'volume__higher':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"volume-higher"),
+                pgettext_lazy("key for text search", "volume-higher"),
                 'volume__gte'),
         'weight__higher':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"weight-higher"),
+                pgettext_lazy("key for text search", "weight-higher"),
                 'weight__gte'),
         'clutter_long_side__higher':
             SearchAltName(
-                pgettext_lazy(u"key for text search",
-                              u"clutter-long-side-higher"),
+                pgettext_lazy("key for text search",
+                              "clutter-long-side-higher"),
                 'clutter_long_side__gte'),
         'clutter_short_side__higher':
             SearchAltName(
-                pgettext_lazy(u"key for text search",
-                              u"clutter-short-side-higher"),
+                pgettext_lazy("key for text search",
+                              "clutter-short-side-higher"),
                 'clutter_short_side__gte'),
         'clutter_height__higher':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"clutter-height-higher"),
+                pgettext_lazy("key for text search", "clutter-height-higher"),
                 'clutter_height__gte'),
 
         'dimensions_comment':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"dimensions-comment"),
+                pgettext_lazy("key for text search", "dimensions-comment"),
                 'dimensions_comment__icontains'),
         'base_finds__topographic_localisation':
             SearchAltName(
-                pgettext_lazy(u"key for text search",
-                              u"topographic-localisation"),
+                pgettext_lazy("key for text search",
+                              "topographic-localisation"),
                 'base_finds__topographic_localisation__iexact'),
         'check_date__before':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"check-date-before"),
+                pgettext_lazy("key for text search", "check-date-before"),
                 'check_date__lte'),
         'check_date__after':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"check-date-after"),
+                pgettext_lazy("key for text search", "check-date-after"),
                 'check_date__gte'),
         'alterations':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"alterations"),
+                pgettext_lazy("key for text search", "alterations"),
                 'alterations__label__iexact'),
         'alteration_causes':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"alteration-causes"),
+                pgettext_lazy("key for text search", "alteration-causes"),
                 'alteration_causes__label__iexact'),
         'treatment_emergency':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"treatment-emergency"),
+                pgettext_lazy("key for text search", "treatment-emergency"),
                 'treatment_emergency__label__iexact'),
         'estimated_value__higher':
             SearchAltName(
-                pgettext_lazy(u"key for text search",
-                              u"estimated-value-higher"),
+                pgettext_lazy("key for text search",
+                              "estimated-value-higher"),
                 'estimated_value__gte'),
         'estimated_value__lower':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"estimated-value-lower"),
+                pgettext_lazy("key for text search", "estimated-value-lower"),
                 'estimated_value__lte'),
         'insurance_value__higher':
             SearchAltName(
-                pgettext_lazy(u"key for text search",
-                              u"insurance-value-higher"),
+                pgettext_lazy("key for text search",
+                              "insurance-value-higher"),
                 'insurance_value__gte'),
         'insurance_value__lower':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"insurance-value-lower"),
+                pgettext_lazy("key for text search", "insurance-value-lower"),
                 'insurance_value__lte'),
         'appraisal_date__before':
             SearchAltName(
-               pgettext_lazy(u"key for text search", u"appraisal-date-before"),
+               pgettext_lazy("key for text search", "appraisal-date-before"),
                 'appraisal_date__lte'),
         'appraisal_date__after':
             SearchAltName(
-                pgettext_lazy(u"key for text search", u"appraisal-date-after"),
+                pgettext_lazy("key for text search", "appraisal-date-after"),
                 'appraisal_date__gte'),
     }
     ALT_NAMES.update(BaseHistorizedItem.ALT_NAMES)
 
     DYNAMIC_REQUESTS = {
         'current_division': DynamicRequest(
-            label=_(u"Division current -"),
+            label=_("Division current -"),
             app_name='archaeological_warehouse', model_name='WarehouseDivision',
             form_key='current_division',
             search_key=pgettext_lazy("key for text search",
@@ -1364,16 +1354,16 @@ class Find(BulkUpdatedItem, ValueGetter, DocumentItem, BaseHistorizedItem,
         ),
     ]
     UP_MODEL_QUERY = {
-        "operation": (pgettext_lazy("key for text search", u"operation"),
+        "operation": (pgettext_lazy("key for text search", "operation"),
                       'cached_label'),
         "contextrecord": (
-            pgettext_lazy("key for text search", u"context-record"),
+            pgettext_lazy("key for text search", "context-record"),
             'cached_label'),
         "warehouse": (
-            pgettext_lazy("key for text search", u"location"),
+            pgettext_lazy("key for text search", "location"),
             'name'),
         "site": (
-            pgettext_lazy("key for text search", u"context-record-site"),
+            pgettext_lazy("key for text search", "context-record-site"),
             'cached_label'),
     }
     RELATIVE_SESSION_NAMES = [
@@ -1560,7 +1550,7 @@ class Find(BulkUpdatedItem, ValueGetter, DocumentItem, BaseHistorizedItem,
     def short_class_name(self):
         return _(u"FIND")
 
-    def __unicode__(self):
+    def __str__(self):
         return self.cached_label or u""
 
     @property
@@ -1569,7 +1559,7 @@ class Find(BulkUpdatedItem, ValueGetter, DocumentItem, BaseHistorizedItem,
 
     @property
     def dating(self):
-        return u" ; ".join([unicode(dating) for dating in self.datings.all()])
+        return u" ; ".join([str(dating) for dating in self.datings.all()])
 
     @property
     def excavation_ids(self):
@@ -1581,7 +1571,7 @@ class Find(BulkUpdatedItem, ValueGetter, DocumentItem, BaseHistorizedItem,
 
     @property
     def materials(self):
-        return u" ; ".join([unicode(material)
+        return u" ; ".join([str(material)
                             for material in self.material_types.all()])
 
     @property
@@ -2122,8 +2112,8 @@ class Find(BulkUpdatedItem, ValueGetter, DocumentItem, BaseHistorizedItem,
         localisation = container.set_localisation(place, value)
         if value and value != '-' and not localisation:
             raise ImporterError(
-                unicode(_(u"The division number {} have not been set "
-                          u"for the warehouse {}.")).format(
+                str(_(u"The division number {} have not been set "
+                      u"for the warehouse {}.")).format(
                     place + 1, container.location))
 
     @post_importer_action
@@ -2353,5 +2343,5 @@ class Property(LightHistorizedItem):
         verbose_name = _(u"Property")
         verbose_name_plural = _(u"Properties")
 
-    def __unicode__(self):
+    def __str__(self):
         return self.person + settings.JOINT + self.find