gryf/ebook-converter
1
0
Fork 0
mirror of https://github.com/gryf/ebook-converter.git synced 2026-04-18 03:53:32 +02:00
Code Issues Projects Releases Wiki Activity

Removing is_py3 method and duplicated by urllib.

Browse Source
This commit is contained in:
gryf
2020-04-19 21:22:24 +02:00
parent b66cbd2c1e
commit ef7e2b10be
35 changed files with 267 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ebook_converter/ebooks/oeb/transforms/filenames.py
View File

@@ -1,9 +1,9 @@
import posixpath
import urllib.parse
from lxml import etree
from ebook_converter.ebooks.oeb.base import rewrite_links, urlnormalize
from ebook_converter.polyglot.urllib import urldefrag, urlparse
__license__ = 'GPL v3'
@@ -38,7 +38,7 @@ class RenameFiles(object): # {{{
if self.oeb.guide:
for ref in self.oeb.guide.values():
href = urlnormalize(ref.href)
href, frag = urldefrag(href)
href, frag = urllib.parse.urldefrag(href)
replacement = self.rename_map.get(href, None)
if replacement is not None:
nhref = replacement
@@ -52,7 +52,7 @@ class RenameFiles(object): # {{{
def fix_toc_entry(self, toc):
if toc.href:
href = urlnormalize(toc.href)
href, frag = urldefrag(href)
href, frag = urllib.parse.urldefrag(href)
replacement = self.rename_map.get(href, None)
if replacement is not None:
@@ -66,11 +66,11 @@ class RenameFiles(object): # {{{
def url_replacer(self, orig_url):
url = urlnormalize(orig_url)
parts = urlparse(url)
parts = urllib.parse.urlparse(url)
if parts.scheme:
# Only rewrite local URLs
return orig_url
path, frag = urldefrag(url)
path, frag = urllib.parse.urldefrag(url)
if self.renamed_items_map:
orig_item = self.renamed_items_map.get(self.current_item.href, self.current_item)
else: