Django

Code

Changeset 5534

Show
Ignore:
Timestamp:
06/25/07 08:46:01 (1 year ago)
Author:
mtredinnick
Message:

unicode: A different version of [5532], based on feedback from Windows users
in far away countries.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/unicode/django/utils/tzinfo.py

    r5532 r5534  
    11"Implementation of tzinfo classes for use with datetime.datetime." 
    22 
     3import locale 
    34import time 
    45from datetime import timedelta, tzinfo 
    56from django.utils.encoding import smart_unicode 
     7 
     8DEFAULT_ENCODING = locale.getdefaultlocale()[1] 
    69 
    710class FixedOffset(tzinfo): 
    …… 
    2730    def __init__(self, dt): 
    2831        tzinfo.__init__(self, dt) 
    29         self._tzname = smart_unicode(time.tzname[self._isdst(dt)]) 
     32        self._tzname = self.tzname(dt) 
    3033 
    3134    def __repr__(self): 
    …… 
    4548 
    4649    def tzname(self, dt): 
    47         return unicode(time.tzname[self._isdst(dt)]) 
     50        try: 
     51            return smart_unicode(time.tzname[self._isdst(dt)], DEFAULT_ENCODING) 
     52        except UnicodeDecodeError: 
     53            return None 
    4854 
    4955    def _isdst(self, dt):