Merge branch 'feature/fix-unicode-issues' into develop

Author: Fantomas42

tagging/models.py

@@ -1,15 +1,20 @@
 """
 Models and managers for generic tagging.
 """
+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.contrib.contenttypes import generic
 from django.contrib.contenttypes.models import ContentType
-from django.db import connection, models
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 
 from . import settings
-from .utils import (calculate_cloud, get_tag_list, get_queryset_and_model,
-    parse_tag_input, LOGARITHMIC)
+from .utils import LOGARITHMIC
+from .utils import get_tag_list
+from .utils import calculate_cloud
+from .utils import parse_tag_input
+from .utils import get_queryset_and_model
 
 
 qn = connection.ops.quote_name
@@ -490,4 +495,4 @@ class Meta:
         verbose_name_plural = _('tagged items')
 
     def __str__(self):
-        return '%s [%s]' % (self.object, self.tag)
+        return '%s [%s]' % (smart_text(self.object), smart_text(self.tag))

tagging/tests/models.py

@@ -4,7 +4,6 @@
 from tagging.fields import TagField
 
 
-@python_2_unicode_compatible
 class Perch(models.Model):
     size = models.IntegerField()
     smelly = models.BooleanField(default=True)
@@ -44,11 +43,9 @@ class Meta:
         ordering = ['name']
 
 
-@python_2_unicode_compatible
 class FormTest(models.Model):
     tags = TagField('Test', help_text='Test')
 
 
-@python_2_unicode_compatible
 class FormTestNull(models.Model):
     tags = TagField(null=True)

tagging/tests/tests.py

@@ -4,16 +4,25 @@
 import os
 
 from django import forms
+from django.utils import six
 from django.db.models import Q
 from django.test import TestCase
 
 from tagging import settings
 from tagging.forms import TagField
 from tagging.models import Tag, TaggedItem
-from tagging.tests.models import Article, Link, Perch, Parrot, FormTest
-from tagging.utils import calculate_cloud, edit_string_for_tags, get_tag_list, get_tag, parse_tag_input
+from tagging.tests.models import Article
+from tagging.tests.models import Link
+from tagging.tests.models import Perch
+from tagging.tests.models import Parrot
+from tagging.tests.models import FormTest
+from tagging.tests.models import FormTestNull
 from tagging.utils import LINEAR
-
+from tagging.utils import get_tag
+from tagging.utils import get_tag_list
+from tagging.utils import calculate_cloud
+from tagging.utils import parse_tag_input
+from tagging.utils import edit_string_for_tags
 
 #############
 # Utilities #
@@ -326,6 +335,14 @@ def test_update_tags_exotic_characters(self):
         self.assertEqual(len(tags), 1)
         self.assertEqual(tags[0].name, '你好')
 
+    def test_unicode_tagged_object(self):
+        self.dead_parrot.state = u"dëad"
+        self.dead_parrot.save()
+        Tag.objects.update_tags(self.dead_parrot, u'föo')
+        items = TaggedItem.objects.all()
+        self.assertEqual(len(items), 1)
+        self.assertEqual(six.text_type(items[0]), u"dëad [föo]")
+
     def test_update_tags_with_none(self):
         # start off in a known, mildly interesting state
         Tag.objects.update_tags(self.dead_parrot, 'foo bar baz')