From 9c5994743c16fba36ead6811973e99e1e742dd8a Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Mon, 25 Jun 2007 12:56:52 +0000 Subject: [PATCH] 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 --- django/utils/tzinfo.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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