Removed Python 2 string compatibility

netbox/virtualization/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/virtualization/api/urls.py

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

netbox/virtualization/api/views.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from dcim.models import Interface
 from extras.api.views import CustomFieldModelViewSet
 from utilities.api import FieldChoicesViewSet, ModelViewSet

netbox/virtualization/apps.py

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

netbox/virtualization/constants.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from dcim.constants import DEVICE_STATUS_ACTIVE, DEVICE_STATUS_OFFLINE, DEVICE_STATUS_STAGED
 
 # VirtualMachine statuses (replicated from Device statuses)

netbox/virtualization/filters.py

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

netbox/virtualization/forms.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django import forms
 from django.core.exceptions import ValidationError
 from django.db.models import Count

netbox/virtualization/migrations/0001_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/virtualization/migrations/0002_virtualmachine_add_status.py

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

netbox/virtualization/migrations/0002_virtualmachine_add_status_squashed_0004_virtualmachine_add_role.py

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

netbox/virtualization/migrations/0003_cluster_add_site.py

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

netbox/virtualization/migrations/0004_virtualmachine_add_role.py

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

netbox/virtualization/migrations/0006_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/virtualization/migrations/0007_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/virtualization/models.py

@@ -1,11 +1,8 @@
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.contrib.contenttypes.fields import GenericRelation
 from django.core.exceptions import ValidationError
 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.models import Device
@@ -18,7 +15,6 @@ from .constants import DEVICE_STATUS_ACTIVE, VM_STATUS_CHOICES, VM_STATUS_CLASSE
 # Cluster types
 #
 
-@python_2_unicode_compatible
 class ClusterType(ChangeLoggedModel):
     """
     A type of Cluster.
@@ -53,7 +49,6 @@ class ClusterType(ChangeLoggedModel):
 # Cluster groups
 #
 
-@python_2_unicode_compatible
 class ClusterGroup(ChangeLoggedModel):
     """
     An organizational group of Clusters.
@@ -88,7 +83,6 @@ class ClusterGroup(ChangeLoggedModel):
 # Clusters
 #
 
-@python_2_unicode_compatible
 class Cluster(ChangeLoggedModel, CustomFieldModel):
     """
     A cluster of VirtualMachines. Each Cluster may optionally be associated with one or more Devices.
@@ -164,7 +158,6 @@ class Cluster(ChangeLoggedModel, CustomFieldModel):
 # Virtual machines
 #
 
-@python_2_unicode_compatible
 class VirtualMachine(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
     """
     A virtual machine which runs inside a Cluster.

netbox/virtualization/tables.py

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

netbox/virtualization/tests/test_api.py

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

netbox/virtualization/urls.py

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

netbox/virtualization/views.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib import messages
 from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.db.models import Count