Removed Python 2 string compatibility

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

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

netbox/tenancy/api/views.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from extras.api.views import CustomFieldModelViewSet
 from tenancy import filters
 from tenancy.models import Tenant, TenantGroup

netbox/tenancy/apps.py

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

netbox/tenancy/filters.py

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

netbox/tenancy/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/tenancy/migrations/0001_initial.py

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

netbox/tenancy/migrations/0002_tenant_group_optional.py

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

netbox/tenancy/migrations/0002_tenant_group_optional_squashed_0003_unicode_literals.py

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

netbox/tenancy/migrations/0003_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
-
 from django.db import migrations, models
 
 

netbox/tenancy/migrations/0004_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/tenancy/migrations/0005_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/tenancy/models.py

@@ -1,16 +1,12 @@
-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 extras.models import CustomFieldModel
 from utilities.models import ChangeLoggedModel
 
 
-@python_2_unicode_compatible
 class TenantGroup(ChangeLoggedModel):
     """
     An arbitrary collection of Tenants.
@@ -41,7 +37,6 @@ class TenantGroup(ChangeLoggedModel):
         )
 
 
-@python_2_unicode_compatible
 class Tenant(ChangeLoggedModel, CustomFieldModel):
     """
     A Tenant represents an organization served by the NetBox owner. This is typically a customer or an internal

netbox/tenancy/tables.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import django_tables2 as tables
 
 from utilities.tables import BaseTable, ToggleColumn

netbox/tenancy/tests/test_api.py

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

netbox/tenancy/urls.py

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

netbox/tenancy/views.py

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