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

fix imports from the wrong module

Browse Source 
when module_a.submodule_a imports module_b, then module_c should not use
"from module_a.submodule_a import module_b"
This commit is contained in:
Eli Schwartz 2019-07-18 12:28:02 -04:00
parent b9fb80d9b0
commit 2212dfc649
No known key found for this signature in database
GPG Key ID: CEB167EFB5722BD6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/ebooks/oeb/transforms/split.py
View File

@ -18,9 +18,10 @@ from lxml import etree
from calibre import as_unicode, force_unicode from calibre import as_unicode, force_unicode
from calibre.ebooks.epub import rules from calibre.ebooks.epub import rules
from calibre.ebooks.oeb.base import (OEB_STYLES, XPNSMAP as NAMESPACES, from calibre.ebooks.oeb.base import (OEB_STYLES, XPNSMAP as NAMESPACES,
urldefrag, rewrite_links, urlunquote, XHTML, urlnormalize) urldefrag, rewrite_links, XHTML, urlnormalize)
from calibre.ebooks.oeb.polish.split import do_split from calibre.ebooks.oeb.polish.split import do_split
from polyglot.builtins import iteritems, range, map from polyglot.builtins import iteritems, range, map
from polyglot.urllib import unquote
from css_selectors import Select, SelectorError from css_selectors import Select, SelectorError
XPath = functools.partial(_XPath, namespaces=NAMESPACES) XPath = functools.partial(_XPath, namespaces=NAMESPACES)
@ -179,7 +180,7 @@ class Split(object):
nhref = anchor_map[frag if frag else None] nhref = anchor_map[frag if frag else None]
nhref = self.current_item.relhref(nhref) nhref = self.current_item.relhref(nhref)
if frag: if frag:
nhref = '#'.join((urlunquote(nhref), frag)) nhref = '#'.join((unquote(nhref), frag))
return nhref return nhref
return url return url