diff options
| author | Dan McGee <dan@archlinux.org> | 2014-09-11 18:29:30 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2014-09-11 18:29:30 -0500 |
| commit | 0bc64e77d405844c7f29170859f14c907f9cb340 (patch) | |
| tree | c05b277fe845c09a7786d5300c459f1ab0fe608f /mirrors/models.py | |
| parent | a8ceba34299cca271ddf433bf7618aa98e56cc36 (diff) | |
| parent | 1173be8b91910ebc82b9b7e5c8e0aaa5af811daf (diff) | |
Merge branch 'django-1.7'
Diffstat (limited to 'mirrors/models.py')
| -rw-r--r-- | mirrors/models.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mirrors/models.py b/mirrors/models.py index e360801b..641a6b97 100644 --- a/mirrors/models.py +++ b/mirrors/models.py @@ -118,7 +118,7 @@ class MirrorRsync(models.Model): created = models.DateTimeField(editable=False) def __unicode__(self): - return self.ip + return unicode(self.ip) class Meta: verbose_name = 'mirror rsync IP' @@ -127,7 +127,7 @@ class MirrorRsync(models.Model): class CheckLocation(models.Model): hostname = models.CharField(max_length=255) - source_ip = models.GenericIPAddressField(verbose_name='source IP', + source_ip = models.GenericIPAddressField('source IP', unpack_ipv4=True, unique=True) country = CountryField() created = models.DateTimeField(editable=False) |