Convert codebase for python3 usage

1 files changed, 8 insertions, 8 deletions

diff --git a/core/models_survex.py b/core/models_survex.py
index 448cea9..6ab6f8a 100644
--- a/core/models_survex.py
+++ b/core/models_survex.py
@@ -1,7 +1,7 @@
 from django.db import models
 from django.conf import settings
 import os
-import urlparse
+import urllib.parse
 import re
 from django.core.urlresolvers import reverse
 
@@ -128,8 +128,8 @@ class SurvexBlock(models.Model):
     def isSurvexBlock(self): # Function used in templates
         return True
 
-    def __unicode__(self):
-        return self.name and unicode(self.name) or 'no name'
+    def __str__(self):
+        return self.name and str(self.name) or 'no name'
     
     def GetPersonroles(self):
         res = [ ]
@@ -185,7 +185,7 @@ class SurvexPersonRole(models.Model):
     expeditionday       = models.ForeignKey("ExpeditionDay", null=True)
     
     def __unicode__(self):
-        return unicode(self.person) + " - " + unicode(self.survexblock) + " - " + unicode(self.nrole)
+        return str(self.person) + " - " + str(self.survexblock) + " - " + str(self.nrole)
         
     
 class SurvexScansFolder(models.Model):
@@ -196,10 +196,10 @@ class SurvexScansFolder(models.Model):
         ordering = ('walletname',)
     
     def get_absolute_url(self):
-        return urlparse.urljoin(settings.URL_ROOT, reverse('surveyscansfolder', kwargs={"path":re.sub("#", "%23", self.walletname)}))
+        return urllib.parse.urljoin(settings.URL_ROOT, reverse('surveyscansfolder', kwargs={"path":re.sub("#", "%23", self.walletname)}))
 
     def __unicode__(self):
-        return unicode(self.walletname) + " (Survey Scans Folder)"
+        return str(self.walletname) + " (Survey Scans Folder)"
     
 class SurvexScanSingle(models.Model):
     ffile               = models.CharField(max_length=200)
@@ -210,10 +210,10 @@ class SurvexScanSingle(models.Model):
         ordering = ('name',)
     
     def get_absolute_url(self):
-        return urlparse.urljoin(settings.URL_ROOT, reverse('surveyscansingle', kwargs={"path":re.sub("#", "%23", self.survexscansfolder.walletname), "file":self.name}))
+        return urllib.parse.urljoin(settings.URL_ROOT, reverse('surveyscansingle', kwargs={"path":re.sub("#", "%23", self.survexscansfolder.walletname), "file":self.name}))
  
     def __unicode__(self):
-        return "Survey Scan Image: " + unicode(self.name) + " in " + unicode(self.survexscansfolder)
+        return "Survey Scan Image: " + str(self.name) + " in " + str(self.survexscansfolder)
     
         
 class TunnelFile(models.Model):