mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Import unicode_literals

Browse Source
This commit is contained in:
Jeremy Stretch
2017-05-24 11:33:11 -04:00
parent 9aad8a7774
commit f21c6bca00
109 changed files with 320 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/ipam/models.py
View File

@ -1,3 +1,5 @@
from __future__ import unicode_literals
from netaddr import IPNetwork, cidr_merge
from django.conf import settings
@ -15,7 +17,6 @@ from tenancy.models import Tenant
from utilities.models import CreatedUpdatedModel
from utilities.sql import NullsFirstQuerySet
from utilities.utils import csv_format
from .fields import IPNetworkField, IPAddressField
@ -499,7 +500,7 @@ class VLANGroup(models.Model):
def __str__(self):
if self.site is None:
return self.name
return u'{} - {}'.format(self.site.name, self.name)
return '{} - {}'.format(self.site.name, self.name)
def get_absolute_url(self):
return "{}?group_id={}".format(reverse('ipam:vlan_list'), self.pk)
@ -566,7 +567,7 @@ class VLAN(CreatedUpdatedModel, CustomFieldModel):
@property
def display_name(self):
if self.vid and self.name:
return u"{} ({})".format(self.vid, self.name)
return "{} ({})".format(self.vid, self.name)
return None
def get_status_class(self):
@ -593,4 +594,4 @@ class Service(CreatedUpdatedModel):
unique_together = ['device', 'protocol', 'port']
def __str__(self):
return u'{} ({}/{})'.format(self.name, self.port, self.get_protocol_display())
return '{} ({}/{})'.format(self.name, self.port, self.get_protocol_display())