Merge pull request #7 from jizdoteka/master-python3-port

Master python3 port

Author: vician

apps/web/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 from django.contrib.auth.models import User
-import models
+from . import models
 
 # Register your models here.
 admin.site.register(models.Comment)

apps/web/models.py

@@ -21,7 +21,7 @@ class UserProfile(models.Model):
     driven_km = models.IntegerField(blank=True, default=0)
     drive_years = models.IntegerField(blank=True, default=0)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.user.username
 
 
@@ -39,7 +39,7 @@ class Waypoint(models.Model):
     long = models.FloatField(verbose_name=_('Longtitude'), default=0)
     #coord = gis_models.PointField(geography=True)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.city
 
 
@@ -59,7 +59,7 @@ class Comment(models.Model):
     date = models.DateTimeField()
     message = models.TextField()
 
-    def __unicode__(self):
+    def __str__(self):
         return '%s: %s' % (self.author, self.message[:50])
 
 
@@ -111,7 +111,7 @@ class Journey(models.Model):
     )
     comments = models.ManyToManyField(Comment, blank=True)
 
-    def __unicode__(self):
+    def __str__(self):
         label = self.journeywaypoints_set.order_by('order')
         return '%s -> %s [%s]' % (
             label.first().waypoint.city,
@@ -163,7 +163,7 @@ class JourneyWaypoints(models.Model):
     class Meta:
         unique_together = (('journey', 'order'),)
 
-    def __unicode__(self):
+    def __str__(self):
         return '%s [#%s]: %s' % (self.journey, self.order, self.waypoint)
 
 
@@ -187,5 +187,5 @@ class Passanger(models.Model):
         default=SUBSCRIBED
     )
 
-    def __unicode__(self):
-        return str(self.user) + ' (' + str(self.journey) + ')'
+    def __str__(self):
+        return str(self.user) + ' (' + str(self.journey) + ')'

apps/web/templatetags/journey_tags.py

@@ -79,13 +79,13 @@ def expr(parser, token):
     try:
         tag_name, arg = token.contents.split(None, 1)
     except ValueError:
-        raise template.TemplateSyntaxError, "%r tag requires arguments" % token.contents[0]
+        raise template.TemplateSyntaxError("%r tag requires arguments") % token.contents[0]
     m = r_expr.search(arg)
     if m:
         expr_string, var_name = m.groups()
     else:
         if not arg:
-            raise template.TemplateSyntaxError, "%r tag at least require one argument" % tag_name
+            raise template.TemplateSyntaxError("%r tag at least require one argument") % tag_name
 
         expr_string, var_name = arg, None
-    return ExprNode(expr_string, var_name)
+    return ExprNode(expr_string, var_name)