From ad11dbf670fb4b419be0c208c77cb1081d57b3b1 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Fri, 17 Aug 2012 14:11:23 +0200 Subject: [PATCH] [py3] Fixed __unicode__ methods missed in d4a0b278 due to non-standard syntax (a stray comma). Thanks dmishe for the report. --- tests/regressiontests/m2m_through_regress/models.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/regressiontests/m2m_through_regress/models.py b/tests/regressiontests/m2m_through_regress/models.py index 1995b78984..47c24ed5b2 100644 --- a/tests/regressiontests/m2m_through_regress/models.py +++ b/tests/regressiontests/m2m_through_regress/models.py @@ -60,22 +60,25 @@ class B(models.Model): # Using to_field on the through model +@python_2_unicode_compatible class Car(models.Model): make = models.CharField(max_length=20, unique=True) drivers = models.ManyToManyField('Driver', through='CarDriver') - def __unicode__(self, ): + def __str__(self): return self.make +@python_2_unicode_compatible class Driver(models.Model): name = models.CharField(max_length=20, unique=True) - def __unicode__(self, ): + def __str__(self): return self.name +@python_2_unicode_compatible class CarDriver(models.Model): car = models.ForeignKey('Car', to_field='make') driver = models.ForeignKey('Driver', to_field='name') - def __unicode__(self, ): + def __str__(self): return "pk=%s car=%s driver=%s" % (str(self.pk), self.car, self.driver)