Update to Django 1.9

- update all dependencies
- fix deprecation warnings and errors for Django 1.9 compatibility
This commit is contained in:
Jan Dittberner 2015-12-19 20:11:23 +01:00
parent 1b30b1a38c
commit 085b126416
21 changed files with 85 additions and 110 deletions

View file

@ -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

View file

@ -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)