summaryrefslogtreecommitdiff
path: root/tests/regressiontests/admin_inlines/models.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/regressiontests/admin_inlines/models.py')
-rw-r--r--tests/regressiontests/admin_inlines/models.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/regressiontests/admin_inlines/models.py b/tests/regressiontests/admin_inlines/models.py
index 5a0f4d84b9..5b703a7481 100644
--- a/tests/regressiontests/admin_inlines/models.py
+++ b/tests/regressiontests/admin_inlines/models.py
@@ -7,22 +7,26 @@ from __future__ import unicode_literals
from django.db import models
from django.contrib.contenttypes.models import ContentType
from django.contrib.contenttypes import generic
+from django.utils.encoding import python_2_unicode_compatible
+@python_2_unicode_compatible
class Parent(models.Model):
name = models.CharField(max_length=50)
- def __unicode__(self):
+ def __str__(self):
return self.name
+@python_2_unicode_compatible
class Teacher(models.Model):
name = models.CharField(max_length=50)
- def __unicode__(self):
+ def __str__(self):
return self.name
+@python_2_unicode_compatible
class Child(models.Model):
name = models.CharField(max_length=50)
teacher = models.ForeignKey(Teacher)
@@ -31,7 +35,7 @@ class Child(models.Model):
object_id = models.PositiveIntegerField()
parent = generic.GenericForeignKey()
- def __unicode__(self):
+ def __str__(self):
return 'I am %s, a child of %s' % (self.name, self.parent)