From 8b74ff4bb60096b1d252aeb90ba6779e305ce788 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Tue, 26 May 2020 02:21:36 +0100 Subject: __unicode__ to __str__ 2to3 conversion --- core/models_survex.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/models_survex.py') diff --git a/core/models_survex.py b/core/models_survex.py index 6ab6f8a..629b4df 100644 --- a/core/models_survex.py +++ b/core/models_survex.py @@ -184,7 +184,7 @@ class SurvexPersonRole(models.Model): persontrip = models.ForeignKey('PersonTrip', blank=True, null=True) expeditionday = models.ForeignKey("ExpeditionDay", null=True) - def __unicode__(self): + def __str__(self): return str(self.person) + " - " + str(self.survexblock) + " - " + str(self.nrole) @@ -198,7 +198,7 @@ class SurvexScansFolder(models.Model): def get_absolute_url(self): return urllib.parse.urljoin(settings.URL_ROOT, reverse('surveyscansfolder', kwargs={"path":re.sub("#", "%23", self.walletname)})) - def __unicode__(self): + def __str__(self): return str(self.walletname) + " (Survey Scans Folder)" class SurvexScanSingle(models.Model): @@ -212,7 +212,7 @@ class SurvexScanSingle(models.Model): def get_absolute_url(self): return urllib.parse.urljoin(settings.URL_ROOT, reverse('surveyscansingle', kwargs={"path":re.sub("#", "%23", self.survexscansfolder.walletname), "file":self.name})) - def __unicode__(self): + def __str__(self): return "Survey Scan Image: " + str(self.name) + " in " + str(self.survexscansfolder) -- cgit v1.2.3