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

IGN: fix munge_paths

Browse Source
This commit is contained in:
Kovid Goyal 2008-05-02 15:52:59 -07:00
parent 74ba2b90a4
commit a9d8b24487
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/ebooks/lrf/html/convert_from.py
View File

@ -53,7 +53,10 @@ def munge_paths(basepath, url):
elif not os.path.isabs(path): elif not os.path.isabs(path):
if isinstance(path, unicode): if isinstance(path, unicode):
path = path.encode(sys.getfilesystemencoding()) 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 return os.path.normpath(path), fragment
def strip_style_comments(match): def strip_style_comments(match):