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

Fix #835

Browse Source
This commit is contained in:
Kovid Goyal 2008-06-30 12:05:51 -07:00
parent 0b0346884f
commit e74166ea09
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/ebooks/metadata/__init__.py
View File

@ -80,14 +80,16 @@ class Resource(object):
basedir = os.getcwd() basedir = os.getcwd()
if self.path is None: if self.path is None:
return self._href return self._href
frag = '#'+quote(self.fragment) if self.fragment else '' f = self.fragment.encode('utf-8') if isinstance(self.fragment, unicode) else self.fragment
frag = '#'+quote(f) if self.fragment else ''
if self.path == basedir: if self.path == basedir:
return ''+frag return ''+frag
try: try:
rpath = relpath(self.path, basedir) rpath = relpath(self.path, basedir)
except OSError: # On windows path and basedir could be on different drives except OSError: # On windows path and basedir could be on different drives
rpath = self.path rpath = self.path
if isinstance(rpath, unicode):
rpath = rpath.encode('utf-8')
return quote(rpath.replace(os.sep, '/'))+frag return quote(rpath.replace(os.sep, '/'))+frag
def set_basedir(self, path): def set_basedir(self, path):