Django

Code

Show
Ignore:
Timestamp:
07/04/07 07:11:04 (2 years ago)
Author:
mtredinnick
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk

    • Property svnmerge-integrated set to /django/trunk:1-5600

  • django/trunk/tests/modeltests/m2m_intermediary/models.py

    r3661 r5609  
    1717    last_name = models.CharField(maxlength=30) 
    1818 
    19     def __str__(self): 
    20         return "%s %s" % (self.first_name, self.last_name) 
     19    def __unicode__(self): 
     20        return u"%s %s" % (self.first_name, self.last_name) 
    2121 
    2222class Article(models.Model): 
    …… 
    2424    pub_date = models.DateField() 
    2525 
    26     def __str__(self): 
     26    def __unicode__(self): 
    2727        return self.headline 
    2828 
    …… 
    3232    position = models.CharField(maxlength=100) 
    3333 
    34     def __str__(self): 
    35         return '%s (%s)' % (self.reporter, self.position) 
     34    def __unicode__(self): 
     35        return u'%s (%s)' % (self.reporter, self.position) 
    3636 
    3737__test__ = {'API_TESTS':"""