mirror of
https://github.com/django/django.git
synced 2025-08-04 10:59:45 +00:00
Merged Unicode branch into trunk (r4952:5608). This should be fully
backwards compatible for all practical purposes. Fixed #2391, #2489, #2996, #3322, #3344, #3370, #3406, #3432, #3454, #3492, #3582, #3690, #3878, #3891, #3937, #4039, #4141, #4227, #4286, #4291, #4300, #4452, #4702 git-svn-id: http://code.djangoproject.com/svn/django/trunk@5609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
4c958b15b2
commit
953badbea5
193 changed files with 3005 additions and 1603 deletions
|
@ -9,14 +9,14 @@ from django.db import models
|
|||
class User(models.Model):
|
||||
name = models.CharField(maxlength=200)
|
||||
|
||||
def __str__(self):
|
||||
def __unicode__(self):
|
||||
return self.name
|
||||
|
||||
class Poll(models.Model):
|
||||
question = models.CharField(maxlength=200)
|
||||
creator = models.ForeignKey(User)
|
||||
|
||||
def __str__(self):
|
||||
def __unicode__(self):
|
||||
return self.question
|
||||
|
||||
class Choice(models.Model):
|
||||
|
@ -24,7 +24,7 @@ class Choice(models.Model):
|
|||
poll = models.ForeignKey(Poll, related_name="poll_choice")
|
||||
related_poll = models.ForeignKey(Poll, related_name="related_choice")
|
||||
|
||||
def __str(self):
|
||||
def __unicode__(self):
|
||||
return self.name
|
||||
|
||||
__test__ = {'API_TESTS':"""
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue