Removed Python 2 string compatibility

netbox/circuits/api/serializers.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from rest_framework import serializers
 from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField
 

netbox/circuits/api/urls.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from rest_framework import routers
 
 from . import views

netbox/circuits/api/views.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.shortcuts import get_object_or_404
 from rest_framework.decorators import action
 from rest_framework.response import Response

netbox/circuits/apps.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.apps import AppConfig
 
 

netbox/circuits/constants.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 
 # Circuit statuses
 CIRCUIT_STATUS_DEPROVISIONING = 0

netbox/circuits/filters.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import django_filters
 from django.db.models import Q
 

netbox/circuits/forms.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django import forms
 from django.db.models import Count
 from taggit.forms import TagField

netbox/circuits/migrations/0001_initial.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-06-22 18:21
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/circuits/migrations/0001_initial_squashed_0010_circuit_status.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.14 on 2018-07-31 02:25
-from __future__ import unicode_literals
-
 import dcim.fields
 from django.db import migrations, models
 import django.db.models.deletion

netbox/circuits/migrations/0002_auto_20160622_1821.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-06-22 18:21
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/circuits/migrations/0003_provider_32bit_asn_support.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-07-13 19:24
-from __future__ import unicode_literals
-
 import dcim.fields
 from django.db import migrations
 

netbox/circuits/migrations/0004_circuit_add_tenant.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.8 on 2016-07-26 21:59
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/circuits/migrations/0005_circuit_add_upstream_speed.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.8 on 2016-08-08 20:24
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/circuits/migrations/0006_terminations.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10 on 2016-12-13 16:30
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/circuits/migrations/0007_circuit_add_description.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10.4 on 2017-01-17 20:08
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/circuits/migrations/0008_circuittermination_interface_protect_on_delete.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11 on 2017-04-19 17:17
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/circuits/migrations/0009_unicode_literals.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11 on 2017-05-24 15:34
-from __future__ import unicode_literals
-
 import dcim.fields
 from django.db import migrations, models
 

netbox/circuits/migrations/0010_circuit_status.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.9 on 2018-02-06 18:48
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/circuits/migrations/0011_tags.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.12 on 2018-05-22 19:04
-from __future__ import unicode_literals
-
 from django.db import migrations
 import taggit.managers
 

netbox/circuits/migrations/0012_change_logging.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.12 on 2018-06-13 17:14
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/circuits/models.py

@@ -1,9 +1,6 @@
-from __future__ import unicode_literals
-
 from django.contrib.contenttypes.fields import GenericRelation
 from django.db import models
 from django.urls import reverse
-from django.utils.encoding import python_2_unicode_compatible
 from taggit.managers import TaggableManager
 
 from dcim.constants import STATUS_CLASSES
@@ -14,7 +11,6 @@ from utilities.utils import serialize_object
 from .constants import CIRCUIT_STATUS_ACTIVE, CIRCUIT_STATUS_CHOICES, TERM_SIDE_CHOICES
 
 
-@python_2_unicode_compatible
 class Provider(ChangeLoggedModel, CustomFieldModel):
     """
     Each Circuit belongs to a Provider. This is usually a telecommunications company or similar organization. This model
@@ -84,7 +80,6 @@ class Provider(ChangeLoggedModel, CustomFieldModel):
         )
 
 
-@python_2_unicode_compatible
 class CircuitType(ChangeLoggedModel):
     """
     Circuits can be organized by their functional role. For example, a user might wish to define CircuitTypes named
@@ -116,7 +111,6 @@ class CircuitType(ChangeLoggedModel):
         )
 
 
-@python_2_unicode_compatible
 class Circuit(ChangeLoggedModel, CustomFieldModel):
     """
     A communications circuit connects two points. Each Circuit belongs to a Provider; Providers may have multiple
@@ -217,7 +211,6 @@ class Circuit(ChangeLoggedModel, CustomFieldModel):
         return self._get_termination('Z')
 
 
-@python_2_unicode_compatible
 class CircuitTermination(models.Model):
     circuit = models.ForeignKey(
         to='circuits.Circuit',

netbox/circuits/signals.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db.models.signals import post_delete, post_save
 from django.dispatch import receiver
 from django.utils import timezone

netbox/circuits/tables.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import django_tables2 as tables
 from django.utils.safestring import mark_safe
 from django_tables2.utils import Accessor

netbox/circuits/tests/test_api.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.urls import reverse
 from rest_framework import status
 

netbox/circuits/urls.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.conf.urls import url
 
 from extras.views import ObjectChangeLogView

netbox/circuits/views.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib import messages
 from django.contrib.auth.decorators import permission_required
 from django.contrib.auth.mixins import PermissionRequiredMixin

netbox/dcim/api/exceptions.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from rest_framework.exceptions import APIException
 
 

netbox/dcim/api/serializers.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from rest_framework import serializers
 from rest_framework.validators import UniqueTogetherValidator
 from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField

netbox/dcim/api/urls.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from rest_framework import routers
 
 from . import views

netbox/dcim/api/views.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from collections import OrderedDict
 
 from django.conf import settings

netbox/dcim/apps.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.apps import AppConfig
 
 

netbox/dcim/constants.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 
 # Rack types
 RACK_TYPE_2POST = 100

netbox/dcim/fields.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from netaddr import EUI, mac_unix_expanded
 
 from django.core.exceptions import ValidationError

netbox/dcim/filters.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import django_filters
 from django.contrib.auth.models import User
 from django.db.models import Q

netbox/dcim/formfields.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django import forms
 from django.core.exceptions import ValidationError
 from netaddr import EUI, AddrFormatError

netbox/dcim/forms.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import re
 
 from django import forms

netbox/dcim/migrations/0001_initial.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-06-22 18:21
-from __future__ import unicode_literals
-
 import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion

netbox/dcim/migrations/0002_auto_20160622_1821.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-06-22 18:21
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/dcim/migrations/0002_auto_20160622_1821_squashed_0022_color_names_to_rgb.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.14 on 2018-07-31 02:06
-from __future__ import unicode_literals
-
 import dcim.fields
 import django.core.validators
 from django.db import migrations, models

netbox/dcim/migrations/0003_auto_20160628_1721.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-06-28 17:21
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/dcim/migrations/0004_auto_20160701_2049.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-07-01 20:49
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/dcim/migrations/0005_auto_20160706_1722.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-07-06 17:22
-from __future__ import unicode_literals
-
 import dcim.fields
 from django.db import migrations, models
 

netbox/dcim/migrations/0006_add_device_primary_ip4_ip6.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-07-11 18:40
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/dcim/migrations/0007_device_copy_primary_ip.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-07-11 18:40
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 

netbox/dcim/migrations/0008_device_remove_primary_ip.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-07-11 19:01
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 

netbox/dcim/migrations/0009_site_32bit_asn_support.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-07-13 19:24
-from __future__ import unicode_literals
-
 import dcim.fields
 from django.db import migrations
 

netbox/dcim/migrations/0010_devicebay_installed_device_set_null.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.7 on 2016-07-14 21:38
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/dcim/migrations/0011_devicetype_part_number.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.8 on 2016-07-26 15:05
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/dcim/migrations/0012_site_rack_device_add_tenant.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.8 on 2016-07-26 21:59
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/dcim/migrations/0013_add_interface_form_factors.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.8 on 2016-08-06 20:24
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/dcim/migrations/0014_rack_add_type_width.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.8 on 2016-08-08 21:11
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/dcim/migrations/0015_rack_add_u_height_validator.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.8 on 2016-08-09 21:18
-from __future__ import unicode_literals
-
 import django.core.validators
 from django.db import migrations, models
 

netbox/dcim/migrations/0016_module_add_manufacturer.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.8 on 2016-08-10 13:45
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/dcim/migrations/0017_rack_add_role.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.8 on 2016-08-10 14:58
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/dcim/migrations/0018_device_add_asset_tag.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10 on 2016-08-11 15:42
-from __future__ import unicode_literals
-
 from django.db import migrations
 import utilities.fields
 

netbox/dcim/migrations/0019_new_iface_form_factors.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10 on 2016-09-13 15:20
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/dcim/migrations/0020_rack_desc_units.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10 on 2016-10-28 15:01
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/dcim/migrations/0021_add_ff_flexstack.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10 on 2016-10-31 18:47
-from __future__ import unicode_literals
-
 import django.core.validators
 from django.db import migrations, models
 

netbox/dcim/migrations/0022_color_names_to_rgb.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10 on 2016-12-06 16:35
-from __future__ import unicode_literals
-
 from django.db import migrations
 import utilities.fields
 

netbox/dcim/migrations/0023_devicetype_comments.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10 on 2016-12-16 16:08
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/dcim/migrations/0023_devicetype_comments_squashed_0043_device_component_name_lengths.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.14 on 2018-07-31 02:13
-from __future__ import unicode_literals
-
 import dcim.fields
 from django.conf import settings
 import django.contrib.postgres.fields

netbox/dcim/migrations/0024_site_add_contact_fields.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10.4 on 2016-12-29 16:23
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/dcim/migrations/0025_devicetype_add_interface_ordering.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10.4 on 2017-01-06 16:56
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/dcim/migrations/0026_add_rack_reservations.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10.4 on 2017-02-16 18:43
-from __future__ import unicode_literals
-
 from django.conf import settings
 import django.contrib.postgres.fields
 from django.db import migrations, models

netbox/dcim/migrations/0027_device_add_site.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10.4 on 2017-02-16 21:21
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/dcim/migrations/0028_device_copy_rack_to_site.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10.4 on 2017-02-16 21:23
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 

netbox/dcim/migrations/0029_allow_rackless_devices.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10.4 on 2017-02-16 21:25
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/dcim/migrations/0030_interface_add_lag.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10.4 on 2017-02-27 19:55
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/dcim/migrations/0031_regions.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10.4 on 2017-02-28 17:14
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 import mptt.fields

netbox/dcim/migrations/0032_device_increase_name_length.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10.4 on 2017-03-02 15:09
-from __future__ import unicode_literals
-
 from django.db import migrations
 import utilities.fields
 

netbox/dcim/migrations/0033_rackreservation_rack_editable.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10.6 on 2017-03-17 18:39
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/dcim/migrations/0034_rename_module_to_inventoryitem.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10.6 on 2017-03-21 14:55
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/dcim/migrations/0035_device_expand_status_choices.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10.7 on 2017-05-08 15:57
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/dcim/migrations/0036_add_ff_juniper_vcp.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.1 on 2017-05-09 16:00
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/dcim/migrations/0037_unicode_literals.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11 on 2017-05-24 15:34
-from __future__ import unicode_literals
-
 import dcim.fields
 import django.core.validators
 from django.db import migrations, models

netbox/dcim/migrations/0038_wireless_interfaces.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.1 on 2017-06-16 21:38
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/dcim/migrations/0039_interface_add_enabled_mtu.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.1 on 2017-06-23 17:05
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/dcim/migrations/0040_inventoryitem_add_asset_tag_description.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11 on 2017-06-23 20:44
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import utilities.fields
 

netbox/dcim/migrations/0041_napalm_integration.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.3 on 2017-07-14 17:26
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/dcim/migrations/0042_interface_ff_10ge_cx4.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.4 on 2017-08-29 21:00
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/dcim/migrations/0043_device_component_name_lengths.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.4 on 2017-08-29 21:26
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/dcim/migrations/0044_virtualization.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.4 on 2017-08-31 14:15
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/dcim/migrations/0044_virtualization_squashed_0055_virtualchassis_ordering.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.14 on 2018-07-31 02:17
-from __future__ import unicode_literals
-
 from django.conf import settings
 import django.core.validators
 from django.db import migrations, models

netbox/dcim/migrations/0045_devicerole_vm_role.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.4 on 2017-09-29 16:09
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/dcim/migrations/0046_rack_lengthen_facility_id.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.4 on 2017-10-09 17:43
-from __future__ import unicode_literals
-
 from django.db import migrations
 import utilities.fields
 

netbox/dcim/migrations/0047_more_100ge_form_factors.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.4 on 2017-10-09 18:43
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/dcim/migrations/0048_rack_serial.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.4 on 2017-10-09 18:50
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/dcim/migrations/0049_rackreservation_change_user.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.6 on 2017-10-31 17:32
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion

netbox/dcim/migrations/0050_interface_vlan_tagging.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.6 on 2017-11-10 20:10
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/dcim/migrations/0051_rackreservation_tenant.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.6 on 2017-11-15 18:56
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/dcim/migrations/0052_virtual_chassis.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.6 on 2017-11-27 17:27
-from __future__ import unicode_literals
-
 import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion

netbox/dcim/migrations/0053_platform_manufacturer.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.6 on 2017-12-19 20:56
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/dcim/migrations/0054_site_status_timezone_description.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.6 on 2018-01-25 18:21
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import timezone_field.fields
 

netbox/dcim/migrations/0055_virtualchassis_ordering.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.9 on 2018-02-21 14:41
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

netbox/dcim/migrations/0057_tags.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.12 on 2018-05-22 19:04
-from __future__ import unicode_literals
-
 from django.db import migrations
 import taggit.managers
 

netbox/dcim/migrations/0058_relax_rack_naming_constraints.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.12 on 2018-05-22 19:27
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 

netbox/dcim/migrations/0059_site_latitude_longitude.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.12 on 2018-06-21 18:45
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/dcim/migrations/0060_change_logging.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.12 on 2018-06-13 17:14
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

netbox/dcim/models.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from collections import OrderedDict
 from itertools import count, groupby
 
@@ -12,7 +10,6 @@ from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.db.models import Count, Q, ObjectDoesNotExist
 from django.urls import reverse
-from django.utils.encoding import python_2_unicode_compatible
 from mptt.models import MPTTModel, TreeForeignKey
 from taggit.managers import TaggableManager
 from timezone_field import TimeZoneField
@@ -58,7 +55,6 @@ class ComponentModel(models.Model):
 # Regions
 #
 
-@python_2_unicode_compatible
 class Region(MPTTModel, ChangeLoggedModel):
     """
     Sites can be grouped within geographic Regions.
@@ -106,7 +102,6 @@ class SiteManager(NaturalOrderByManager):
     natural_order_field = 'name'
 
 
-@python_2_unicode_compatible
 class Site(ChangeLoggedModel, CustomFieldModel):
     """
     A Site represents a geographic location within a network; typically a building or campus. The optional facility
@@ -268,7 +263,6 @@ class Site(ChangeLoggedModel, CustomFieldModel):
 # Racks
 #
 
-@python_2_unicode_compatible
 class RackGroup(ChangeLoggedModel):
     """
     Racks can be grouped as subsets within a Site. The scope of a group will depend on how Sites are defined. For
@@ -308,7 +302,6 @@ class RackGroup(ChangeLoggedModel):
         )
 
 
-@python_2_unicode_compatible
 class RackRole(ChangeLoggedModel):
     """
     Racks can be organized by functional role, similar to Devices.
@@ -345,7 +338,6 @@ class RackManager(NaturalOrderByManager):
     natural_order_field = 'name'
 
 
-@python_2_unicode_compatible
 class Rack(ChangeLoggedModel, CustomFieldModel):
     """
     Devices are housed within Racks. Each rack has a defined height measured in rack units, and a front and rear face.
@@ -603,7 +595,6 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
         return int(float(self.u_height - u_available) / self.u_height * 100)
 
 
-@python_2_unicode_compatible
 class RackReservation(ChangeLoggedModel):
     """
     One or more reserved units within a Rack.
@@ -677,7 +668,6 @@ class RackReservation(ChangeLoggedModel):
 # Device Types
 #
 
-@python_2_unicode_compatible
 class Manufacturer(ChangeLoggedModel):
     """
     A Manufacturer represents a company which produces hardware devices; for example, Juniper or Dell.
@@ -708,7 +698,6 @@ class Manufacturer(ChangeLoggedModel):
         )
 
 
-@python_2_unicode_compatible
 class DeviceType(ChangeLoggedModel, CustomFieldModel):
     """
     A DeviceType represents a particular make (Manufacturer) and model of device. It specifies rack height and depth, as
@@ -882,7 +871,6 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel):
         return bool(self.subdevice_role is False)
 
 
-@python_2_unicode_compatible
 class ConsolePortTemplate(ComponentModel):
     """
     A template for a ConsolePort to be created for a new Device.
@@ -907,7 +895,6 @@ class ConsolePortTemplate(ComponentModel):
         return self.device_type
 
 
-@python_2_unicode_compatible
 class ConsoleServerPortTemplate(ComponentModel):
     """
     A template for a ConsoleServerPort to be created for a new Device.
@@ -932,7 +919,6 @@ class ConsoleServerPortTemplate(ComponentModel):
         return self.device_type
 
 
-@python_2_unicode_compatible
 class PowerPortTemplate(ComponentModel):
     """
     A template for a PowerPort to be created for a new Device.
@@ -957,7 +943,6 @@ class PowerPortTemplate(ComponentModel):
         return self.device_type
 
 
-@python_2_unicode_compatible
 class PowerOutletTemplate(ComponentModel):
     """
     A template for a PowerOutlet to be created for a new Device.
@@ -982,7 +967,6 @@ class PowerOutletTemplate(ComponentModel):
         return self.device_type
 
 
-@python_2_unicode_compatible
 class InterfaceTemplate(ComponentModel):
     """
     A template for a physical data interface on a new Device.
@@ -1017,7 +1001,6 @@ class InterfaceTemplate(ComponentModel):
         return self.device_type
 
 
-@python_2_unicode_compatible
 class DeviceBayTemplate(ComponentModel):
     """
     A template for a DeviceBay to be created for a new parent Device.
@@ -1046,7 +1029,6 @@ class DeviceBayTemplate(ComponentModel):
 # Devices
 #
 
-@python_2_unicode_compatible
 class DeviceRole(ChangeLoggedModel):
     """
     Devices are organized by functional role; for example, "Core Switch" or "File Server". Each DeviceRole is assigned a
@@ -1084,7 +1066,6 @@ class DeviceRole(ChangeLoggedModel):
         )
 
 
-@python_2_unicode_compatible
 class Platform(ChangeLoggedModel):
     """
     Platform refers to the software or firmware running on a Device. For example, "Cisco IOS-XR" or "Juniper Junos".
@@ -1150,7 +1131,6 @@ class DeviceManager(NaturalOrderByManager):
     natural_order_field = 'name'
 
 
-@python_2_unicode_compatible
 class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
     """
     A Device represents a piece of physical hardware mounted within a Rack. Each Device is assigned a DeviceType,
@@ -1543,7 +1523,6 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
 # Console ports
 #
 
-@python_2_unicode_compatible
 class ConsolePort(ComponentModel):
     """
     A physical console port within a Device. ConsolePorts connect to ConsoleServerPorts.
@@ -1610,7 +1589,6 @@ class ConsoleServerPortManager(models.Manager):
         }).order_by('device', 'name_padded')
 
 
-@python_2_unicode_compatible
 class ConsoleServerPort(ComponentModel):
     """
     A physical port within a Device (typically a designated console server) which provides access to ConsolePorts.
@@ -1655,7 +1633,6 @@ class ConsoleServerPort(ComponentModel):
 # Power ports
 #
 
-@python_2_unicode_compatible
 class PowerPort(ComponentModel):
     """
     A physical power supply (intake) port within a Device. PowerPorts connect to PowerOutlets.
@@ -1721,7 +1698,6 @@ class PowerOutletManager(models.Manager):
         }).order_by('device', 'name_padded')
 
 
-@python_2_unicode_compatible
 class PowerOutlet(ComponentModel):
     """
     A physical power outlet (output) within a Device which provides power to a PowerPort.
@@ -1766,7 +1742,6 @@ class PowerOutlet(ComponentModel):
 # Interfaces
 #
 
-@python_2_unicode_compatible
 class Interface(ComponentModel):
     """
     A network interface within a Device or VirtualMachine. A physical Interface can connect to exactly one other
@@ -2095,7 +2070,6 @@ class InterfaceConnection(models.Model):
 # Device bays
 #
 
-@python_2_unicode_compatible
 class DeviceBay(ComponentModel):
     """
     An empty space within a Device which can house a child device
@@ -2149,7 +2123,6 @@ class DeviceBay(ComponentModel):
 # Inventory items
 #
 
-@python_2_unicode_compatible
 class InventoryItem(ComponentModel):
     """
     An InventoryItem represents a serialized piece of hardware within a Device, such as a line card or power supply.
@@ -2241,7 +2214,6 @@ class InventoryItem(ComponentModel):
 # Virtual chassis
 #
 
-@python_2_unicode_compatible
 class VirtualChassis(ChangeLoggedModel):
     """
     A collection of Devices which operate with a shared control plane (e.g. a switch stack).

netbox/dcim/querysets.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db.models import QuerySet
 from django.db.models.expressions import RawSQL