python3 compat and deps++

dpdapi/admin.py

@@ -17,4 +17,4 @@ class DomainAdmin(admin.ModelAdmin):
 
 @admin.register(User)
 class UserAdmin(admin.ModelAdmin):
-    pass
+    pass

dpdapi/management/commands/import_valiases.py

@@ -57,4 +57,4 @@ class Command(BaseCommand):
         self.stdout.write('Imported {}, skipped {} existing, total {}'.format(
             counts['imported'],
             counts['existing'],
-            len(new_aliases)))
+            len(new_aliases)))

dpdapi/models.py

@@ -1,5 +1,6 @@
 from __future__ import unicode_literals
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 
 
 class BaseModel(models.Model):
@@ -10,13 +11,14 @@ class BaseModel(models.Model):
         abstract = True
 
 
+@python_2_unicode_compatible
 class Alias(BaseModel):
     source = models.EmailField(max_length=254)
     destination = models.EmailField(max_length=254)
     domain = models.ForeignKey('dpdapi.Domain')
     active = models.BooleanField(default=True)
 
-    def __unicode__(self):
+    def __str__(self):
         return "{}={}".format(self.source, self.destination)
 
     def save(self, *args, **kwargs):
@@ -30,10 +32,11 @@ class Alias(BaseModel):
         unique_together = ('source', 'destination', 'domain')
 
 
+@python_2_unicode_compatible
 class Domain(BaseModel):
     name = models.CharField(max_length=254, unique=True)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     def save(self, *args, **kwargs):
@@ -42,12 +45,13 @@ class Domain(BaseModel):
         super(Domain, self).save(*args, **kwargs)
 
 
+@python_2_unicode_compatible
 class User(BaseModel):
     email = models.EmailField(max_length=254, unique=True)
     password = models.CharField(max_length=109)
     domain = models.ForeignKey('dpdapi.Domain')
 
-    def __unicode__(self):
+    def __str__(self):
         return self.email
 
     def save(self, *args, **kwargs):

dpdapi/urls.py

@@ -7,4 +7,4 @@ router = DefaultRouter()
 router.register(r'aliases', AliasViewSet)
 router.register(r'domains', DomainViewSet)
 router.register(r'users', UserViewSet)
-urlpatterns = router.urls
+urlpatterns = router.urls

dpdapi/views.py

@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 import logging
 import operator
+from django.utils import six
 from django.db.models import Q
 from rest_framework.decorators import list_route
 from rest_framework.permissions import IsAuthenticated
@@ -11,6 +12,8 @@ from dpdapi.filters import AliasRegexFilterBackend
 from dpdapi.models import Alias, Domain, User
 from dpdapi.serializers import AliasSerializer, AliasDeleteSerializer, DomainSerializer, UserSerializer
 
+if six.PY3:
+    from functools import reduce
 
 logger = logging.getLogger(__name__)