Make the code working with Django 2+

Author: Fantomas42

tagging/models.py

@@ -4,7 +4,6 @@
 from django.db import models
 from django.db import connection
 from django.utils.encoding import smart_text
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.fields import GenericForeignKey
@@ -474,7 +473,6 @@ def get_related(self, obj, queryset_or_model, num=None):
 # Models #
 ##########
 
-@python_2_unicode_compatible
 class Tag(models.Model):
     """
     A tag.
@@ -494,7 +492,6 @@ def __str__(self):
         return self.name
 
 
-@python_2_unicode_compatible
 class TaggedItem(models.Model):
     """
     Holds the relationship between a tag and the item being tagged.

tagging/utils.py

@@ -4,7 +4,6 @@
 """
 import math
 
-from django.utils import six
 from django.db.models.query import QuerySet
 from django.utils.encoding import force_text
 from django.utils.translation import ugettext as _
@@ -171,18 +170,18 @@ def get_tag_list(tags):
         return [tags]
     elif isinstance(tags, QuerySet) and tags.model is Tag:
         return tags
-    elif isinstance(tags, six.string_types):
+    elif isinstance(tags, str):
         return Tag.objects.filter(name__in=parse_tag_input(tags))
     elif isinstance(tags, (list, tuple)):
         if len(tags) == 0:
             return tags
         contents = set()
         for item in tags:
-            if isinstance(item, six.string_types):
+            if isinstance(item, str):
                 contents.add('string')
             elif isinstance(item, Tag):
                 contents.add('tag')
-            elif isinstance(item, six.integer_types):
+            elif isinstance(item, int):
                 contents.add('int')
         if len(contents) == 1:
             if 'string' in contents:
@@ -216,9 +215,9 @@ def get_tag(tag):
         return tag
 
     try:
-        if isinstance(tag, six.string_types):
+        if isinstance(tag, str):
             return Tag.objects.get(name=tag)
-        elif isinstance(tag, six.integer_types):
+        elif isinstance(tag, int):
             return Tag.objects.get(id=tag)
     except Tag.DoesNotExist:
         pass