From 14e62aa99c660d2b74bd8839d681e4d767241028 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 18 May 2008 10:00:14 -0700 Subject: [PATCH] More TOC unicode fixes --- src/calibre/ebooks/lrf/html/convert_from.py | 3 +-- src/calibre/ebooks/metadata/toc.py | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/calibre/ebooks/lrf/html/convert_from.py b/src/calibre/ebooks/lrf/html/convert_from.py index 42fd012428..79e2490d18 100644 --- a/src/calibre/ebooks/lrf/html/convert_from.py +++ b/src/calibre/ebooks/lrf/html/convert_from.py @@ -287,8 +287,7 @@ class HTMLConverter(object, LoggingInterface): self.book.append(self.current_page) for text, tb in self.extra_toc_entries: - ascii_text = text.encode('ascii', 'ignore') - self.book.addTocEntry(ascii_text, tb) + self.book.addTocEntry(text, tb) if self.base_font_size > 0: self.log_info('\tRationalizing font sizes...') diff --git a/src/calibre/ebooks/metadata/toc.py b/src/calibre/ebooks/metadata/toc.py index 3caa23934b..c77836c457 100644 --- a/src/calibre/ebooks/metadata/toc.py +++ b/src/calibre/ebooks/metadata/toc.py @@ -96,9 +96,7 @@ class TOC(list): def read_ncx_toc(self, toc): self.base_path = os.path.dirname(toc) - print xml_to_unicode(open(toc, 'rb').read(), True)[1] soup = NCXSoup(xml_to_unicode(open(toc, 'rb').read())[0]) - print unicode(soup).encode('utf8') def process_navpoint(np, dest): play_order = np.get('playOrder', 1)