diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-06-25 12:56:52 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-06-25 12:56:52 +0000 |
| commit | 9c5994743c16fba36ead6811973e99e1e742dd8a (patch) | |
| tree | 288e221aa8d587592f806a35ae7b9fb236cab05d | |
| parent | 0ced8b0bb211fca38669293b15316930e0d648fd (diff) | |
unicode: Fixed an encoding problem that was showing up on non-English versions
of Windows (where timezone strings are different to POSIX systems).
git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5532 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/utils/tzinfo.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/django/utils/tzinfo.py b/django/utils/tzinfo.py index b486db4f33..8a1a887346 100644 --- a/django/utils/tzinfo.py +++ b/django/utils/tzinfo.py @@ -2,6 +2,7 @@ import time from datetime import timedelta, tzinfo +from django.utils.encoding import smart_unicode class FixedOffset(tzinfo): "Fixed offset in minutes east from UTC." @@ -25,7 +26,7 @@ class LocalTimezone(tzinfo): "Proxy timezone information from time module." def __init__(self, dt): tzinfo.__init__(self, dt) - self._tzname = unicode(time.tzname[self._isdst(dt)]) + self._tzname = smart_unicode(time.tzname[self._isdst(dt)]) def __repr__(self): return self._tzname |