Removed Python 2 string compatibility

netbox/extras/admin.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django import forms
 from django.contrib import admin
 from django.utils.safestring import mark_safe

netbox/extras/api/customfields.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from datetime import datetime
 
 from django.contrib.contenttypes.models import ContentType

netbox/extras/api/serializers.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.core.exceptions import ObjectDoesNotExist
 from rest_framework import serializers
 from taggit.models import Tag

netbox/extras/api/urls.py

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

netbox/extras/api/views.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib.contenttypes.models import ContentType
 from django.db.models import Count
 from django.http import Http404, HttpResponse

netbox/extras/apps.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.apps import AppConfig
 from django.core.exceptions import ImproperlyConfigured
 from django.conf import settings

netbox/extras/constants.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 
 # Models which support custom fields
 CUSTOMFIELD_MODELS = (

netbox/extras/filters.py

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

netbox/extras/forms.py

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

netbox/extras/management/commands/nbshell.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import code
 import platform
 import sys

netbox/extras/management/commands/run_inventory.py

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

netbox/extras/management/commands/runreport.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.core.management.base import BaseCommand
 from django.utils import timezone
 

netbox/extras/middleware.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from datetime import timedelta
 import random
 import threading

netbox/extras/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.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion

netbox/extras/migrations/0001_initial_squashed_0010_customfield_filter_logic.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.14 on 2018-07-31 02:19
-from __future__ import unicode_literals
-
 import re
 from distutils.version import StrictVersion
 

netbox/extras/migrations/0002_custom_fields.py

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

netbox/extras/migrations/0003_exporttemplate_add_description.py

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

netbox/extras/migrations/0004_topologymap_change_comma_to_semicolon.py

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

netbox/extras/migrations/0005_useraction_add_bulk_create.py

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

netbox/extras/migrations/0006_add_imageattachments.py

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

netbox/extras/migrations/0007_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
 import extras.models
 

netbox/extras/migrations/0008_reports.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.4 on 2017-09-26 21:25
-from __future__ import unicode_literals
 from distutils.version import StrictVersion
 import re
 

netbox/extras/migrations/0009_topologymap_type.py

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

netbox/extras/migrations/0010_customfield_filter_logic.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.9 on 2018-02-21 19:48
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 from extras.constants import CF_FILTER_DISABLED, CF_FILTER_EXACT, CF_FILTER_LOOSE, CF_TYPE_SELECT

netbox/extras/migrations/0012_webhooks.py

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

netbox/extras/migrations/0013_objectchange.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.12 on 2018-06-22 18:13
-from __future__ import unicode_literals
-
 from django.conf import settings
 import django.contrib.postgres.fields.jsonb
 from django.db import migrations, models

netbox/extras/models.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from collections import OrderedDict
 from datetime import date
 
@@ -14,7 +12,6 @@ from django.db.models import Q
 from django.http import HttpResponse
 from django.template import Template, Context
 from django.urls import reverse
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.safestring import mark_safe
 
 from dcim.constants import CONNECTION_STATUS_CONNECTED
@@ -27,7 +24,6 @@ from .querysets import ConfigContextQuerySet
 # Webhooks
 #
 
-@python_2_unicode_compatible
 class Webhook(models.Model):
     """
     A Webhook defines a request that will be sent to a remote application when an object is created, updated, and/or
@@ -136,7 +132,6 @@ class CustomFieldModel(models.Model):
             return OrderedDict([(field, None) for field in fields])
 
 
-@python_2_unicode_compatible
 class CustomField(models.Model):
     obj_type = models.ManyToManyField(
         to=ContentType,
@@ -227,7 +222,6 @@ class CustomField(models.Model):
         return serialized_value
 
 
-@python_2_unicode_compatible
 class CustomFieldValue(models.Model):
     field = models.ForeignKey(
         to='extras.CustomField',
@@ -271,7 +265,6 @@ class CustomFieldValue(models.Model):
             super(CustomFieldValue, self).save(*args, **kwargs)
 
 
-@python_2_unicode_compatible
 class CustomFieldChoice(models.Model):
     field = models.ForeignKey(
         to='extras.CustomField',
@@ -309,7 +302,6 @@ class CustomFieldChoice(models.Model):
 # Graphs
 #
 
-@python_2_unicode_compatible
 class Graph(models.Model):
     type = models.PositiveSmallIntegerField(
         choices=GRAPH_TYPE_CHOICES
@@ -351,7 +343,6 @@ class Graph(models.Model):
 # Export templates
 #
 
-@python_2_unicode_compatible
 class ExportTemplate(models.Model):
     content_type = models.ForeignKey(
         to=ContentType,
@@ -410,7 +401,6 @@ class ExportTemplate(models.Model):
 # Topology maps
 #
 
-@python_2_unicode_compatible
 class TopologyMap(models.Model):
     name = models.CharField(
         max_length=50,
@@ -571,7 +561,6 @@ def image_upload(instance, filename):
     return '{}{}_{}_{}'.format(path, instance.content_type.name, instance.object_id, filename)
 
 
-@python_2_unicode_compatible
 class ImageAttachment(models.Model):
     """
     An uploaded image which is associated with an object.
@@ -752,7 +741,6 @@ class ReportResult(models.Model):
 # Change logging
 #
 
-@python_2_unicode_compatible
 class ObjectChange(models.Model):
     """
     Record a change to an object and the user account associated with that change. A change record may optionally
@@ -904,7 +892,6 @@ class UserActionManager(models.Manager):
 
 
 # TODO: Remove UserAction, which has been replaced by ObjectChange.
-@python_2_unicode_compatible
 class UserAction(models.Model):
     """
     DEPRECATED: A record of an action (add, edit, or delete) performed on an object by a User.

netbox/extras/querysets.py

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

netbox/extras/reports.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from collections import OrderedDict
 import importlib
 import inspect

netbox/extras/rpc.py

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

netbox/extras/tables.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import django_tables2 as tables
 from taggit.models import Tag
 

netbox/extras/tests/test_api.py

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

netbox/extras/tests/test_customfields.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from datetime import date
 
 from django.contrib.contenttypes.models import ContentType

netbox/extras/tests/test_tags.py

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

netbox/extras/urls.py

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

netbox/extras/views.py

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