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_multiple/models.py

    r3661 r5609  
    1515       ordering = ('name',) 
    1616 
    17     def __str__(self): 
     17    def __unicode__(self): 
    1818        return self.name 
    1919 
    …… 
    2626       ordering = ('pub_date',) 
    2727 
    28     def __str__(self): 
     28    def __unicode__(self): 
    2929        return self.headline 
    3030