flo/nsupdate.info
1
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Releases Activity

dont use unicode_literals

Browse Source
This commit is contained in:
elnappo 2014-12-28 14:19:24 +01:00
parent 1897c9a913
commit 37bb496e3b
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nsupdate/main/models.py
View File

@ -1,8 +1,6 @@
""" """
models for hosts, domains, service updaters, ... models for hosts, domains, service updaters, ...
""" """
from __future__ import unicode_literals
import re import re
import time import time
import base64 import base64
@ -59,7 +57,7 @@ class BlacklistedHost(models.Model):
def host_blacklist_validator(value): def host_blacklist_validator(value):
for bd in BlacklistedHost.objects.all(): for bd in BlacklistedHost.objects.all():
if re.search(bd.name_re, value): if re.search(bd.name_re, value):
raise ValidationError('This name is blacklisted') raise ValidationError(u'This name is blacklisted')
from collections import namedtuple from collections import namedtuple
@ -249,7 +247,7 @@ class Host(models.Model):
created_by = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='hosts', verbose_name=_("created by"),) created_by = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='hosts', verbose_name=_("created by"),)
def __str__(self): def __str__(self):
return "%s.%s" % (self.name, self.domain.name) return u"%s.%s" % (self.name, self.domain.name)
class Meta(object): class Meta(object):
unique_together = (('name', 'domain'), ) unique_together = (('name', 'domain'), )
@ -404,7 +402,7 @@ class RelatedHost(models.Model):
verbose_name=_("main host")) verbose_name=_("main host"))
def __str__(self): def __str__(self):
return "%s.%s" % (self.name, self.main_host) return u"%s.%s" % (self.name, self.main_host.__unicode__())
class Meta(object): class Meta(object):
unique_together = (('name', 'main_host'), ) unique_together = (('name', 'main_host'), )
@ -523,7 +521,7 @@ class ServiceUpdaterHostConfig(models.Model):
verbose_name=_("created by")) verbose_name=_("created by"))
def __str__(self): def __str__(self):
return "%s (%s)" % (self.hostname, self.service.name, ) return u"%s (%s)" % (self.hostname, self.service.name, )
class Meta(object): class Meta(object):
verbose_name = _('service updater host config') verbose_name = _('service updater host config')