summaryrefslogtreecommitdiffstats
path: root/core/models_survex.py
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@klebos.com>2020-05-26 02:21:36 +0100
committerPhilip Sargent <philip.sargent@klebos.com>2020-05-26 02:21:36 +0100
commit8b74ff4bb60096b1d252aeb90ba6779e305ce788 (patch)
treea249da76b2930e94cd8a01ab6d9dc3896c16a61c /core/models_survex.py
parentf4099c69292d3bff272cc1c8c3275b368ae1801b (diff)
downloadtroggle-8b74ff4bb60096b1d252aeb90ba6779e305ce788.tar.gz
troggle-8b74ff4bb60096b1d252aeb90ba6779e305ce788.tar.bz2
troggle-8b74ff4bb60096b1d252aeb90ba6779e305ce788.zip
__unicode__ to __str__ 2to3 conversion
Diffstat (limited to 'core/models_survex.py')
-rw-r--r--core/models_survex.py6
1 files changed, 3 insertions, 3 deletions
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)