Merge tag 'upstream/0.4'

Upstream version 0.4

# gpg: Signature made Sun 15 Nov 2015 10:26:06 PM CET using RSA key ID 016CFFD0
# gpg: Good signature from "Jonas Genannt <jonas@brachium-system.net>"
# gpg:                 aka "Jonas Genannt <jonas.genannt@capi2name.de>"
# gpg:                 aka "Jonas Genannt <genannt@debian.org>"

* tag 'upstream/0.4':
  Imported Upstream version 0.4

1 files changed, 16 insertions, 3 deletions

diff --git a/tagging/tests/models.py b/tagging/tests/models.py
index 0708686..1babd58 100644
--- a/tagging/tests/models.py
+++ b/tagging/tests/models.py
@@ -1,38 +1,51 @@
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 
 from tagging.fields import TagField
 
+
 class Perch(models.Model):
     size = models.IntegerField()
     smelly = models.BooleanField(default=True)
 
+
+@python_2_unicode_compatible
 class Parrot(models.Model):
     state = models.CharField(max_length=50)
     perch = models.ForeignKey(Perch, null=True)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.state
 
     class Meta:
         ordering = ['state']
 
+
+@python_2_unicode_compatible
 class Link(models.Model):
     name = models.CharField(max_length=50)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     class Meta:
         ordering = ['name']
 
+
+@python_2_unicode_compatible
 class Article(models.Model):
     name = models.CharField(max_length=50)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     class Meta:
         ordering = ['name']
 
+
 class FormTest(models.Model):
     tags = TagField('Test', help_text='Test')
+
+
+class FormTestNull(models.Model):
+    tags = TagField(null=True)