[py3] Refactored __unicode__ to __str__.

* Renamed the __unicode__ methods
* Applied the python_2_unicode_compatible decorator
* Removed the StrAndUnicode mix-in that is superseded by
  python_2_unicode_compatible
* Kept the __unicode__ methods in classes that specifically
  test it under Python 2

1 files changed, 5 insertions, 2 deletions

diff --git a/tests/regressiontests/syndication/models.py b/tests/regressiontests/syndication/models.py
index a2c504e57f..10b3fe3a0c 100644
--- a/tests/regressiontests/syndication/models.py
+++ b/tests/regressiontests/syndication/models.py
@@ -1,6 +1,8 @@
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 
 
+@python_2_unicode_compatible
 class Entry(models.Model):
     title = models.CharField(max_length=200)
     date = models.DateTimeField()
@@ -8,17 +10,18 @@ class Entry(models.Model):
     class Meta:
         ordering = ('date',)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title
 
     def get_absolute_url(self):
         return "/blog/%s/" % self.pk
 
 
+@python_2_unicode_compatible
 class Article(models.Model):
     title = models.CharField(max_length=200)
     entry = models.ForeignKey(Entry)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title