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

Fix #3555 (UnicodeDecodeError: ... unexpected code byte in Russian fb2)

Browse Source
This commit is contained in:
Kovid Goyal 2009-09-22 13:47:14 -06:00
parent 74db760282
commit be0a623e65
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/ebooks/fb2/input.py
View File

@ -45,7 +45,7 @@ class FB2Input(InputFormatPlugin):
log.debug('Parsing XML...') log.debug('Parsing XML...')
parser = etree.XMLParser(recover=True, no_network=True) parser = etree.XMLParser(recover=True, no_network=True)
doc = etree.parse(stream, parser) doc = etree.fromstring(stream.read())
self.extract_embedded_content(doc) self.extract_embedded_content(doc)
log.debug('Converting XML to HTML...') log.debug('Converting XML to HTML...')
ss = open(P('templates/fb2.xsl'), 'rb').read() ss = open(P('templates/fb2.xsl'), 'rb').read()

2
src/calibre/ebooks/metadata/meta.py
View File

@ -130,7 +130,7 @@ def metadata_from_filename(name, pat=None):
au = match.group('author') au = match.group('author')
aus = string_to_authors(au) aus = string_to_authors(au)
mi.authors = aus mi.authors = aus
except IndexError: except (IndexError, ValueError):
pass pass
try: try:
mi.series = match.group('series') mi.series = match.group('series')