Update to Django 1.9

- update all dependencies
- fix deprecation warnings and errors for Django 1.9 compatibility

gnuviechadmin/domains/models.py

@@ -50,7 +50,6 @@ DNS_TSIG_KEY_ALGORITHMS = Choices(
 )
 
 
-@python_2_unicode_compatible
 class DomainBase(TimeStampedModel):
     """
     This is the base model for domains.
@@ -64,9 +63,6 @@ class DomainBase(TimeStampedModel):
     class Meta:
         abstract = True
 
-    def __str__(self):
-        return self.domain
-
 
 @python_2_unicode_compatible
 class MailDomain(DomainBase):

gnuviechadmin/domains/tests/test_forms.py

@@ -9,7 +9,7 @@ from mock import MagicMock, Mock, patch
 from django.core.urlresolvers import reverse
 from django.forms import ValidationError
 from django.test import TestCase
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ugettext as _
 
 from domains.forms import relative_domain_validator, CreateHostingDomainForm
 

gnuviechadmin/domains/tests/test_models.py

@@ -17,7 +17,6 @@ from domains.models import (
     DNSRecord,
     DNSSupermaster,
     DNSTSIGKey,
-    DomainBase,
     HostingDomain,
     MailDomain,
 )
@@ -32,13 +31,6 @@ User = get_user_model()
 TEST_USER = 'test'
 
 
-class DomainBaseTest(TestCase):
-
-    def test___str__(self):
-        db = DomainBase(domain='test')
-        self.assertEqual(str(db), 'test')
-
-
 class MailDomainTest(TestCase):
 
     def test___str__(self):
@@ -48,8 +40,7 @@ class MailDomainTest(TestCase):
     def test_get_mailaddresses(self):
         md = MailDomain.objects.create(domain='example.org')
         from managemails.models import MailAddress
-        addrmock = MailAddress(localpart='info')
-        md.mailaddress_set.add(addrmock)
+        addrmock = MailAddress.objects.create(localpart='info', domain=md)
         self.assertIn(addrmock, md.get_mailaddresses())
         self.assertIn(addrmock, md.mailaddresses)
 

gnuviechadmin/domains/urls.py

@@ -4,13 +4,12 @@ This module defines the URL patterns for domain related views.
 """
 from __future__ import absolute_import, unicode_literals
 
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from .views import CreateHostingDomain
 
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^(?P<package>\d+)/create$', CreateHostingDomain.as_view(),
         name='create_hosting_domain'),
-)
+]