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

    r3661 r5609  
    2424    objects = PersonManager() 
    2525 
    26     def __str__(self): 
    27         return "%s %s" % (self.first_name, self.last_name) 
     26    def __unicode__(self): 
     27        return u"%s %s" % (self.first_name, self.last_name) 
    2828 
    2929# An example of a custom manager that sets get_query_set(). 
    …… 
    4040    authors = models.ManyToManyField(Person, related_name='books') 
    4141 
    42     def __str__(self): 
     42    def __unicode__(self): 
    4343        return self.title 
    4444 
    …… 
    5656    fast_cars = FastCarManager() 
    5757 
    58     def __str__(self): 
     58    def __unicode__(self): 
    5959        return self.name 
    6060