Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

#3059: Stop decoding Unicode in calendar module. 

The strftime routines must know how to decode
localized month/day names themselves.
This commit is contained in:
Georg Brandl 2008-06-08 08:40:05 +00:00
parent f010bd5c34
commit fd68087b29
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Lib/calendar.py
View File

@ -481,13 +481,13 @@ class HTMLCalendar(Calendar):
return ''.join(v).encode(encoding, "xmlcharrefreplace") return ''.join(v).encode(encoding, "xmlcharrefreplace")
class TimeEncoding: class different_locale:
def __init__(self, locale): def __init__(self, locale):
self.locale = locale self.locale = locale
def __enter__(self): def __enter__(self):
self.oldlocale = _locale.setlocale(_locale.LC_TIME, self.locale) self.oldlocale = _locale.setlocale(_locale.LC_TIME, self.locale)
return _locale.getlocale(_locale.LC_TIME)[1] #return _locale.getlocale(_locale.LC_TIME)[1]
def __exit__(self, *args): def __exit__(self, *args):
_locale.setlocale(_locale.LC_TIME, self.oldlocale) _locale.setlocale(_locale.LC_TIME, self.oldlocale)
@ -508,21 +508,17 @@ class LocaleTextCalendar(TextCalendar):
self.locale = locale self.locale = locale
def formatweekday(self, day, width): def formatweekday(self, day, width):
with TimeEncoding(self.locale) as encoding: with different_locale(self.locale):
if width >= 9: if width >= 9:
names = day_name names = day_name
else: else:
names = day_abbr names = day_abbr
name = names[day] name = names[day]
if encoding is not None:
name = name.decode(encoding)
return name[:width].center(width) return name[:width].center(width)
def formatmonthname(self, theyear, themonth, width, withyear=True): def formatmonthname(self, theyear, themonth, width, withyear=True):
with TimeEncoding(self.locale) as encoding: with different_locale(self.locale):
s = month_name[themonth] s = month_name[themonth]
if encoding is not None:
s = s.decode(encoding)
if withyear: if withyear:
s = "%s %r" % (s, theyear) s = "%s %r" % (s, theyear)
return s.center(width) return s.center(width)
@ -542,17 +538,13 @@ class LocaleHTMLCalendar(HTMLCalendar):
self.locale = locale self.locale = locale
def formatweekday(self, day): def formatweekday(self, day):
with TimeEncoding(self.locale) as encoding: with different_locale(self.locale):
s = day_abbr[day] s = day_abbr[day]
if encoding is not None:
s = s.decode(encoding)
return '<th class="%s">%s</th>' % (self.cssclasses[day], s) return '<th class="%s">%s</th>' % (self.cssclasses[day], s)
def formatmonthname(self, theyear, themonth, withyear=True): def formatmonthname(self, theyear, themonth, withyear=True):
with TimeEncoding(self.locale) as encoding: with different_locale(self.locale):
s = month_name[themonth] s = month_name[themonth]
if encoding is not None:
s = s.decode(encoding)
if withyear: if withyear:
s = '%s %s' % (s, theyear) s = '%s %s' % (s, theyear)
return '<tr><th colspan="7" class="month">%s</th></tr>' % s return '<tr><th colspan="7" class="month">%s</th></tr>' % s