diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-02-27 20:44:52 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-06-17 13:21:27 +0200 |
commit | 86c03a98d11e93880b4568776e0939113a92a707 (patch) | |
tree | e07ad2e91e2544f7b2d61e8f3f653fdda26bfd52 /archaeological_context_records/models.py | |
parent | 52f442699a72ff5d0341a7d15d5b966a3cc2bd60 (diff) | |
download | Ishtar-86c03a98d11e93880b4568776e0939113a92a707.tar.bz2 Ishtar-86c03a98d11e93880b4568776e0939113a92a707.zip |
Migrate to python 3 - Clean old migrations and some old scripts
Diffstat (limited to 'archaeological_context_records/models.py')
-rw-r--r-- | archaeological_context_records/models.py | 292 |
1 files changed, 146 insertions, 146 deletions
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 190baffad..22d72a82a 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -44,8 +44,8 @@ from archaeological_operations.models import Operation, Period, Parcel, \ class DatingType(GeneralType): class Meta: - verbose_name = _(u"Dating type") - verbose_name_plural = _(u"Dating types") + verbose_name = _("Dating type") + verbose_name_plural = _("Dating types") ordering = ('label',) @@ -55,8 +55,8 @@ post_delete.connect(post_save_cache, sender=DatingType) class DatingQuality(GeneralType): class Meta: - verbose_name = _(u"Dating quality type") - verbose_name_plural = _(u"Dating quality types") + verbose_name = _("Dating quality type") + verbose_name_plural = _("Dating quality types") ordering = ('label',) @@ -65,28 +65,28 @@ post_delete.connect(post_save_cache, sender=DatingQuality) class Dating(models.Model): - period = models.ForeignKey(Period, verbose_name=_(u"Period")) - start_date = models.IntegerField(_(u"Start date"), blank=True, null=True) - end_date = models.IntegerField(_(u"End date"), blank=True, null=True) - dating_type = models.ForeignKey(DatingType, verbose_name=_(u"Dating type"), + period = models.ForeignKey(Period, verbose_name=_("Period")) + start_date = models.IntegerField(_("Start date"), blank=True, null=True) + end_date = models.IntegerField(_("End date"), blank=True, null=True) + dating_type = models.ForeignKey(DatingType, verbose_name=_("Dating type"), on_delete=models.SET_NULL, blank=True, null=True) - quality = models.ForeignKey(DatingQuality, verbose_name=_(u"Quality"), + quality = models.ForeignKey(DatingQuality, verbose_name=_("Quality"), on_delete=models.SET_NULL, blank=True, null=True) - precise_dating = models.TextField(_(u"Precise dating"), blank=True, + precise_dating = models.TextField(_("Precise dating"), blank=True, null=True) class Meta: - verbose_name = _(u"Dating") - verbose_name_plural = _(u"Datings") + verbose_name = _("Dating") + verbose_name_plural = _("Datings") - def __unicode__(self): - start_date = self.start_date and unicode(self.start_date) or u"" - end_date = self.end_date and unicode(self.end_date) or u"" + def __str__(self): + start_date = self.start_date and str(self.start_date) or "" + end_date = self.end_date and str(self.end_date) or "" if not start_date and not end_date: - return unicode(self.period) - return u"%s (%s-%s)" % (self.period, start_date, end_date) + return str(self.period) + return "%s (%s-%s)" % (self.period, start_date, end_date) HISTORY_ATTR = ["period", "start_date", "end_date", "dating_type", "quality", "precise_dating"] @@ -102,7 +102,7 @@ class Dating(models.Model): elif val is None: val = '' else: - val = unicode(val) + val = str(val) values[attr] = val return values @@ -150,17 +150,17 @@ class Dating(models.Model): return True def context_records_lbl(self): - return u" - ".join( + return " - ".join( [cr.cached_label for cr in self.context_records.all()] ) - context_records_lbl.short_description = _(u"Context record") + context_records_lbl.short_description = _("Context record") context_records_lbl.admin_order_field = "context_records__cached_label" def finds_lbl(self): - return u" - ".join( + return " - ".join( [f.cached_label for f in self.find.all()] ) - finds_lbl.short_description = _(u"Find") + finds_lbl.short_description = _("Find") finds_lbl.admin_order_field = "find__cached_label" @classmethod @@ -179,17 +179,17 @@ class Dating(models.Model): class Unit(GeneralType): - order = models.IntegerField(_(u"Order")) + order = models.IntegerField(_("Order")) parent = models.ForeignKey( - "Unit", verbose_name=_(u"Parent context record type"), + "Unit", verbose_name=_("Parent context record type"), on_delete=models.SET_NULL, blank=True, null=True) class Meta: - verbose_name = _(u"Context record Type") - verbose_name_plural = _(u"Context record Types") + verbose_name = _("Context record Type") + verbose_name_plural = _("Context record Types") ordering = ('order', 'label') - def __unicode__(self): + def __str__(self): return self.label @@ -198,14 +198,14 @@ post_delete.connect(post_save_cache, sender=Unit) class ActivityType(GeneralType): - order = models.IntegerField(_(u"Order")) + order = models.IntegerField(_("Order")) class Meta: - verbose_name = _(u"Activity Type") - verbose_name_plural = _(u"Activity Types") + verbose_name = _("Activity Type") + verbose_name_plural = _("Activity Types") ordering = ('order',) - def __unicode__(self): + def __str__(self): return self.label @@ -214,14 +214,14 @@ post_delete.connect(post_save_cache, sender=ActivityType) class IdentificationType(GeneralType): - order = models.IntegerField(_(u"Order")) + order = models.IntegerField(_("Order")) class Meta: - verbose_name = _(u"Identification Type") - verbose_name_plural = _(u"Identification Types") + verbose_name = _("Identification Type") + verbose_name_plural = _("Identification Types") ordering = ('order', 'label') - def __unicode__(self): + def __str__(self): return self.label @@ -231,8 +231,8 @@ post_delete.connect(post_save_cache, sender=IdentificationType) class ExcavationTechnicType(GeneralType): class Meta: - verbose_name = _(u"Excavation technique type") - verbose_name_plural = _(u"Excavation technique types") + verbose_name = _("Excavation technique type") + verbose_name_plural = _("Excavation technique types") ordering = ('label',) @@ -242,8 +242,8 @@ post_delete.connect(post_save_cache, sender=ExcavationTechnicType) class DocumentationType(GeneralType): class Meta: - verbose_name = _(u"Documentation type") - verbose_name_plural = _(u"Documentation types") + verbose_name = _("Documentation type") + verbose_name_plural = _("Documentation types") ordering = ('label',) @@ -287,17 +287,17 @@ class ContextRecord(BulkUpdatedItem, DocumentItem, BaseHistorizedItem, TABLE_COLS_FOR_OPE = ['label', 'parcel', 'unit', 'datings__period__label', 'description'] COL_LABELS = { - 'datings__period__label': _(u"Periods"), - 'datings__period': _(u"Datings (period)"), - 'detailled_related_context_records': _(u"Related context records"), - 'operation__code_patriarche': _(u"Operation (Patriarche code)"), - 'operation__common_name': _(u"Operation (name)"), - 'parcel__external_id': _(u"Parcel (external ID)"), - 'town__name': _(u"Town"), - 'town': _(u"Town"), - 'parcel__year': _(u"Parcel (year)"), - 'section__parcel_number': _(u"Parcel"), - 'parcel__cached_label': _(u"Parcel"), + 'datings__period__label': _("Periods"), + 'datings__period': _("Datings (period)"), + 'detailled_related_context_records': _("Related context records"), + 'operation__code_patriarche': _("Operation (Patriarche code)"), + 'operation__common_name': _("Operation (name)"), + 'parcel__external_id': _("Parcel (external ID)"), + 'town__name': _("Town"), + 'town': _("Town"), + 'parcel__year': _("Parcel (year)"), + 'section__parcel_number': _("Parcel"), + 'parcel__cached_label': _("Parcel"), } CONTEXTUAL_TABLE_COLS = { 'full': { @@ -330,51 +330,51 @@ class ContextRecord(BulkUpdatedItem, DocumentItem, BaseHistorizedItem, # alternative names of fields for searches ALT_NAMES = { 'label': SearchAltName( - pgettext_lazy("key for text search", u"id"), + pgettext_lazy("key for text search", "id"), 'label__iexact' ), 'town': SearchAltName( - pgettext_lazy("key for text search", u"town"), + pgettext_lazy("key for text search", "town"), 'town__cached_label__iexact' ), 'operation__year': SearchAltName( - pgettext_lazy("key for text search", u"operation-year"), + pgettext_lazy("key for text search", "operation-year"), 'operation__year' ), 'operation__code_patriarche': SearchAltName( - pgettext_lazy("key for text search", u"patriarche"), + pgettext_lazy("key for text search", "patriarche"), 'operation__code_patriarche__iexact' ), 'operation__operation_code': SearchAltName( - pgettext_lazy("key for text search", u"operation-code"), + pgettext_lazy("key for text search", "operation-code"), 'operation__operation_code' ), 'operation__cached_label': SearchAltName( - pgettext_lazy("key for text search", u"operation"), + pgettext_lazy("key for text search", "operation"), 'operation__cached_label__icontains' ), 'archaeological_site': SearchAltName( - pgettext_lazy("key for text search", u"site"), + pgettext_lazy("key for text search", "site"), 'archaeological_site__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' ), 'datings__period': SearchAltName( - pgettext_lazy("key for text search", u"period"), + pgettext_lazy("key for text search", "period"), 'datings__period__label__iexact' ), 'unit': SearchAltName( - pgettext_lazy("key for text search", u"unit-type"), + pgettext_lazy("key for text search", "unit-type"), 'unit__label__iexact' ), 'parcel': SearchAltName( - pgettext_lazy("key for text search", u"parcel"), + pgettext_lazy("key for text search", "parcel"), 'parcel__cached_label__iexact' ), 'cr_relation_types': SearchAltName( - pgettext_lazy("key for text search", u"record-relation-type"), + pgettext_lazy("key for text search", "record-relation-type"), 'cr_relation_types' ), } @@ -397,10 +397,10 @@ class ContextRecord(BulkUpdatedItem, DocumentItem, BaseHistorizedItem, ] UP_MODEL_QUERY = { "operation": ( - pgettext_lazy("key for text search", u"operation"), + pgettext_lazy("key for text search", "operation"), 'cached_label'), "site": ( - pgettext_lazy("key for text search", u"site"), + pgettext_lazy("key for text search", "site"), 'cached_label'), } RELATIVE_SESSION_NAMES = [ @@ -416,74 +416,74 @@ class ContextRecord(BulkUpdatedItem, DocumentItem, BaseHistorizedItem, objects = ExternalIdManager() # fields - external_id = models.TextField(_(u"External ID"), blank=True, null=True) + external_id = models.TextField(_("External ID"), blank=True, null=True) auto_external_id = models.BooleanField( - _(u"External ID is set automatically"), default=False) + _("External ID is set automatically"), default=False) parcel = models.ForeignKey( - Parcel, verbose_name=_(u"Parcel"), related_name='context_record', + Parcel, verbose_name=_("Parcel"), related_name='context_record', on_delete=models.SET_NULL, blank=True, null=True) town = models.ForeignKey( - Town, verbose_name=_(u"Town"), related_name='context_record', + Town, verbose_name=_("Town"), related_name='context_record', on_delete=models.SET_NULL, blank=True, null=True) - operation = models.ForeignKey(Operation, verbose_name=_(u"Operation"), + operation = models.ForeignKey(Operation, verbose_name=_("Operation"), related_name='context_record') archaeological_site = models.ForeignKey( - ArchaeologicalSite, verbose_name=_(u"Archaeological site"), + ArchaeologicalSite, verbose_name=_("Archaeological site"), on_delete=models.SET_NULL, blank=True, null=True, related_name='context_records') - label = models.CharField(_(u"ID"), max_length=200) - description = models.TextField(_(u"Description"), blank=True, null=True) - comment = models.TextField(_(u"General comment"), blank=True, null=True) - opening_date = models.DateField(_(u"Opening date"), + label = models.CharField(_("ID"), max_length=200) + description = models.TextField(_("Description"), blank=True, null=True) + comment = models.TextField(_("General comment"), blank=True, null=True) + opening_date = models.DateField(_("Opening date"), blank=True, null=True) - closing_date = models.DateField(_(u"Closing date"), blank=True, null=True) - length = models.FloatField(_(u"Length (m)"), blank=True, null=True) - width = models.FloatField(_(u"Width (m)"), blank=True, null=True) - thickness = models.FloatField(_(u"Thickness (m)"), blank=True, + closing_date = models.DateField(_("Closing date"), blank=True, null=True) + length = models.FloatField(_("Length (m)"), blank=True, null=True) + width = models.FloatField(_("Width (m)"), blank=True, null=True) + thickness = models.FloatField(_("Thickness (m)"), blank=True, null=True) - diameter = models.FloatField(_(u"Diameter (m)"), blank=True, null=True) - depth = models.FloatField(_(u"Depth (m)"), blank=True, null=True) + diameter = models.FloatField(_("Diameter (m)"), blank=True, null=True) + depth = models.FloatField(_("Depth (m)"), blank=True, null=True) depth_of_appearance = models.FloatField( - _(u"Depth of appearance (m)"), blank=True, null=True) + _("Depth of appearance (m)"), blank=True, null=True) location = models.TextField( - _(u"Location"), blank=True, null=True, - help_text=_(u"A short description of the location of the context " - u"record")) + _("Location"), blank=True, null=True, + help_text=_("A short description of the location of the context " + "record")) datings = models.ManyToManyField(Dating, related_name='context_records') documentations = models.ManyToManyField(DocumentationType, blank=True) - datings_comment = models.TextField(_(u"Comment on datings"), blank=True, + datings_comment = models.TextField(_("Comment on datings"), blank=True, null=True) - unit = models.ForeignKey(Unit, verbose_name=_(u"Context record type"), + unit = models.ForeignKey(Unit, verbose_name=_("Context record type"), on_delete=models.SET_NULL, related_name='+', blank=True, null=True) - filling = models.TextField(_(u"Filling"), blank=True, null=True) - interpretation = models.TextField(_(u"Interpretation"), blank=True, + filling = models.TextField(_("Filling"), blank=True, null=True) + interpretation = models.TextField(_("Interpretation"), blank=True, null=True) taq = models.IntegerField( - _(u"TAQ"), blank=True, null=True, - help_text=_(u"\"Terminus Ante Quem\" the context record can't have " - u"been created after this date")) + _("TAQ"), blank=True, null=True, + help_text=_("\"Terminus Ante Quem\" the context record can't have " + "been created after this date")) taq_estimated = models.IntegerField( - _(u"Estimated TAQ"), blank=True, null=True, - help_text=_(u"Estimation of a \"Terminus Ante Quem\"")) + _("Estimated TAQ"), blank=True, null=True, + help_text=_("Estimation of a \"Terminus Ante Quem\"")) tpq = models.IntegerField( - _(u"TPQ"), blank=True, null=True, - help_text=_(u"\"Terminus Post Quem\" the context record can't have " - u"been created before this date")) + _("TPQ"), blank=True, null=True, + help_text=_("\"Terminus Post Quem\" the context record can't have " + "been created before this date")) tpq_estimated = models.IntegerField( - _(u"Estimated TPQ"), blank=True, null=True, - help_text=_(u"Estimation of a \"Terminus Post Quem\"")) + _("Estimated TPQ"), blank=True, null=True, + help_text=_("Estimation of a \"Terminus Post Quem\"")) identification = models.ForeignKey( IdentificationType, blank=True, null=True, on_delete=models.SET_NULL, - verbose_name=_(u"Identification"),) + verbose_name=_("Identification"),) activity = models.ForeignKey(ActivityType, blank=True, null=True, on_delete=models.SET_NULL, - verbose_name=_(u"Activity"),) + verbose_name=_("Activity"),) excavation_technic = models.ForeignKey( ExcavationTechnicType, blank=True, null=True, on_delete=models.SET_NULL, - verbose_name=_(u"Excavation technique")) + verbose_name=_("Excavation technique")) related_context_records = models.ManyToManyField( 'ContextRecord', through='RecordRelations', blank=True) x = models.FloatField(_(u'X'), blank=True, null=True) @@ -511,24 +511,24 @@ class ContextRecord(BulkUpdatedItem, DocumentItem, BaseHistorizedItem, choices=(('T', _(u"Town")), ('P', _(u"Precise"))), max_length=1, blank=True, null=True) documents = models.ManyToManyField( - Document, related_name='context_records', verbose_name=_(u"Documents"), + Document, related_name='context_records', verbose_name=_("Documents"), blank=True) main_image = models.ForeignKey( Document, related_name='main_image_context_records', on_delete=models.SET_NULL, - verbose_name=_(u"Main image"), blank=True, null=True) - cached_label = models.TextField(_(u"Cached name"), null=True, blank=True, + verbose_name=_("Main image"), blank=True, null=True) + cached_label = models.TextField(_("Cached name"), null=True, blank=True, db_index=True) class Meta: - verbose_name = _(u"Context Record") - verbose_name_plural = _(u"Context Record") + verbose_name = _("Context Record") + verbose_name_plural = _("Context Record") permissions = ( - ("view_contextrecord", u"Can view all Context Records"), - ("view_own_contextrecord", u"Can view own Context Record"), - ("add_own_contextrecord", u"Can add own Context Record"), - ("change_own_contextrecord", u"Can change own Context Record"), - ("delete_own_contextrecord", u"Can delete own Context Record"), + ("view_contextrecord", "Can view all Context Records"), + ("view_own_contextrecord", "Can view own Context Record"), + ("add_own_contextrecord", "Can add own Context Record"), + ("change_own_contextrecord", "Can change own Context Record"), + ("delete_own_contextrecord", "Can delete own Context Record"), ) ordering = ('cached_label',) @@ -541,9 +541,9 @@ class ContextRecord(BulkUpdatedItem, DocumentItem, BaseHistorizedItem, @property def short_class_name(self): - return pgettext("short", u"Context record") + return pgettext("short", "Context record") - def __unicode__(self): + def __str__(self): return self.short_label def get_values(self, prefix='', no_values=False, no_base_finds=True): @@ -660,7 +660,7 @@ class ContextRecord(BulkUpdatedItem, DocumentItem, BaseHistorizedItem, @property def short_label(self): - return settings.JOINT.join([unicode(item) for item in [ + return settings.JOINT.join([str(item) for item in [ self.operation.get_reference(), self.parcel, self.label] if item]) @property @@ -697,7 +697,7 @@ class ContextRecord(BulkUpdatedItem, DocumentItem, BaseHistorizedItem, return cls._return_get_owns(owns, values, get_short_menu_class) def full_label(self): - return unicode(self) + return str(self) def _real_label(self): if not self.operation.code_patriarche: @@ -708,7 +708,7 @@ class ContextRecord(BulkUpdatedItem, DocumentItem, BaseHistorizedItem, def _temp_label(self): if self.operation.code_patriarche: return - return settings.JOINT.join([unicode(lbl) for lbl in [ + return settings.JOINT.join([str(lbl) for lbl in [ self.operation.year, self.operation.operation_code, self.label] if lbl]) @@ -727,17 +727,17 @@ class ContextRecord(BulkUpdatedItem, DocumentItem, BaseHistorizedItem, def _get_base_image_path(self): return self.operation._get_base_image_path() + \ - u"/{}/{}".format(self.SLUG, slugify(self.label or u"00")) + "/{}/{}".format(self.SLUG, slugify(self.label or "00")) @property def archaeological_site_reference(self): if self.archaeological_site: return self.archaeological_site.reference if self.operation.archaeological_sites.count(): - return u"-".join( + return "-".join( [a.reference for a in self.operation.archaeological_sites.all()] ) - return u"" + return "" @property def reference(self): @@ -795,9 +795,9 @@ class ContextRecord(BulkUpdatedItem, DocumentItem, BaseHistorizedItem, def detailled_related_context_records(self): crs = [] for cr in self.right_relations.all(): - crs.append(u"{} ({})".format(cr.right_record, + crs.append("{} ({})".format(cr.right_record, cr.relation_type.get_tiny_label())) - return u" ; ".join(crs) + return " ; ".join(crs) def find_docs_q(self): return Document.objects.filter(finds__base_finds__context_record=self) @@ -833,8 +833,8 @@ for attr in ContextRecord.HISTORICAL_M2M: class RelationType(GeneralRelationType): class Meta: - verbose_name = _(u"Relation type") - verbose_name_plural = _(u"Relation types") + verbose_name = _("Relation type") + verbose_name_plural = _("Relation types") ordering = ('order', 'label') @@ -851,17 +851,17 @@ class RecordRelations(GeneralRecordRelations, models.Model): "right_record__label", "right_record__unit", "right_record__parcel", ] COL_LABELS = { - "left_record__label": _(u"ID (left)"), - "left_record__unit": _(u"Context record type (left)"), - "left_record__parcel": _(u"Parcel (left)"), - "left_record__description": _(u"Description (left)"), - "left_record__datings__period": _(u"Periods (left)"), - "relation_type": _(u"Relation type"), - "right_record__label": _(u"ID (right)"), - "right_record__unit": _(u"Context record type (right)"), - "right_record__parcel": _(u"Parcel (right)"), - "right_record__description": _(u"Description (right)"), - "right_record__datings__period": _(u"Periods (right)") + "left_record__label": _("ID (left)"), + "left_record__unit": _("Context record type (left)"), + "left_record__parcel": _("Parcel (left)"), + "left_record__description": _("Description (left)"), + "left_record__datings__period": _("Periods (left)"), + "relation_type": _("Relation type"), + "right_record__label": _("ID (right)"), + "right_record__unit": _("Context record type (right)"), + "right_record__parcel": _("Parcel (right)"), + "right_record__description": _("Description (right)"), + "right_record__datings__period": _("Periods (right)") } # search parameters @@ -870,10 +870,10 @@ class RecordRelations(GeneralRecordRelations, models.Model): } class Meta: - verbose_name = _(u"Record relation") - verbose_name_plural = _(u"Record relations") + verbose_name = _("Record relation") + verbose_name_plural = _("Record relations") permissions = [ - ("view_recordrelation", u"Can view all Context record relations"), + ("view_recordrelation", "Can view all Context record relations"), ] @@ -901,12 +901,12 @@ class RecordRelationView(models.Model): "right_record__label", "right_record__unit", "right_record__parcel", "right_record__datings__period", "right_record__description"] COL_LABELS = { - "relation_type": _(u"Relation type"), - "right_record__label": _(u"ID"), - "right_record__unit": _(u"Context record type"), - "right_record__parcel": _(u"Parcel"), - "right_record__description": _(u"Description"), - "right_record__datings__period": _(u"Periods") + "relation_type": _("Relation type"), + "right_record__label": _("ID"), + "right_record__unit": _("Context record type"), + "right_record__parcel": _("Parcel"), + "right_record__description": _("Description"), + "right_record__datings__period": _("Periods") } # search parameters @@ -925,12 +925,12 @@ class RecordRelationView(models.Model): db_table = 'record_relations' unique_together = ('id', 'right_record') permissions = [ - ("view_recordrelation", u"Can view all record relations - view"), + ("view_recordrelation", "Can view all record relations - view"), ] @classmethod def general_types(cls): return [] - def __unicode__(self): - return u"{} \"{}\"".format(self.relation_type, self.right_record) + def __str__(self): + return "{} \"{}\"".format(self.relation_type, self.right_record) |