From a9d8b2448797d168742bf2c7d3f2d74824085f0f Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 2 May 2008 15:52:59 -0700 Subject: [PATCH] IGN: fix munge_paths --- src/calibre/ebooks/lrf/html/convert_from.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/calibre/ebooks/lrf/html/convert_from.py b/src/calibre/ebooks/lrf/html/convert_from.py index b5ce06b052..131c7bd318 100644 --- a/src/calibre/ebooks/lrf/html/convert_from.py +++ b/src/calibre/ebooks/lrf/html/convert_from.py @@ -53,7 +53,10 @@ def munge_paths(basepath, url): elif not os.path.isabs(path): if isinstance(path, unicode): path = path.encode(sys.getfilesystemencoding()) - path = os.path.join(os.path.dirname(basepath), path) + dn = os.path.dirname(basepath) + if isinstance(dn, unicode): + dn = dn.encode(sys.getfilesystemencoding()) + path = os.path.join(dn, path) return os.path.normpath(path), fragment def strip_style_comments(match):