Django

Code

Changeset 5372

Show
Ignore:
Timestamp:
05/28/07 06:04:13 (1 year ago)
Author:
mtredinnick
Message:

unicode: Fixed a problem when models had non-ASCII bytestrings for their
verbose_name.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/unicode/django/db/models/options.py

    r5345 r5372  
    77from django.db.models import Manager 
    88from django.utils.translation import activate, deactivate_all, get_language, string_concat 
     9from django.utils.encoding import force_unicode, smart_str 
    910from bisect import bisect 
    1011import re 
    …… 
    9192    def __repr__(self): 
    9293        return '<Options for %s>' % self.object_name 
    93          
     94 
    9495    def __str__(self): 
    95         return "%s.%s" % (self.app_label, self.module_name) 
     96        return "%s.%s" % (smart_str(self.app_label), smart_str(self.module_name)) 
    9697 
    9798    def verbose_name_raw(self): 
    …… 
    103104        lang = get_language() 
    104105        deactivate_all() 
    105         raw = unicode(self.verbose_name) 
     106        raw = force_unicode(self.verbose_name) 
    106107        activate(lang) 
    107108        return raw 

  • django/branches/unicode/tests/modeltests/basic/models.py

    r4971 r5372  
     1# coding: utf-8 
    12""" 
    231. Bare-bones model