gryf/ebook-converter
1
0
Fork 0
mirror of https://github.com/gryf/ebook-converter.git synced 2026-03-23 10:53:34 +01:00
Code Issues Projects Releases Wiki Activity

Get rid of polyglot as_unicode

Browse Source
This commit is contained in:
gryf
2020-06-17 17:45:07 +02:00
parent 4b27f55f5b
commit 976ef5ce36
5 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ebook_converter/ebooks/metadata/__init__.py
View File

@@ -10,7 +10,6 @@ import urllib.parse
from ebook_converter import relpath, prints, force_unicode
from ebook_converter.utils.config_base import tweaks
from ebook_converter.polyglot.builtins import as_unicode
from ebook_converter.polyglot.urllib import unquote
@@ -268,17 +267,14 @@ class Resource(object):
basedir = os.getcwd()
if self.path is None:
return self._href
f = self.fragment.encode('utf-8') if isinstance(self.fragment, str) else self.fragment
frag = '#'+as_unicode(urllib.parse.quote(f)) if self.fragment else ''
frag = '#' + urllib.parse.quote(self.fragment) if self.fragment else ''
if self.path == basedir:
return ''+frag
return '' + frag
try:
rpath = relpath(self.path, basedir)
except OSError: # On windows path and basedir could be on different drives
rpath = self.path
if isinstance(rpath, str):
rpath = rpath.encode('utf-8')
return as_unicode(urllib.parse.quote(rpath.replace(os.sep, '/')))+frag
return urllib.parse.quote(rpath.replace(os.sep, '/')) + frag
def set_basedir(self, path):
self._basedir = path