Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 10:14:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix nasty regression in news fetching code

Browse Source
This commit is contained in:
Kovid Goyal 2008-05-16 09:28:09 -07:00
parent b3052188d2
commit f7b1d8d0d7
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/web/feeds/templates.py
View File

@ -4,6 +4,8 @@ __license__ = 'GPL v3'
__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
import datetime, locale
from genshi.template import MarkupTemplate
from calibre import preferred_encoding
class Template(MarkupTemplate):
@ -121,11 +123,10 @@ class IndexTemplate(Template):
''')
def generate(self, title, datefmt, feeds):
date = datetime.datetime.now().strftime(datefmt)
try:
date = date.decode(locale.getpreferredencoding())
except:
date = date.decode('utf-8', 'ascii')
if isinstance(datefmt, unicode):
datefmt = datefmt.encode(preferred_encoding)
date = datetime.datetime.now().strftime(datefmt)
date = date.decode(preferred_encoding, 'replace')
return Template.generate(self, title=title, date=date, feeds=feeds)
@ -205,4 +206,4 @@ class EmbeddedContent(Template):
''')
def generate(self, article):
return Template.generate(self, article=article)
return Template.generate(self, article=article)