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

Removed isbytestring function

Browse Source
This commit is contained in:
gryf
2020-06-14 12:10:40 +02:00
parent a69884d724
commit be671ef2d8
10 changed files with 29 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ebook_converter/ebooks/oeb/base.py
View File

@@ -20,7 +20,7 @@ from ebook_converter import force_unicode
from ebook_converter.constants_old import filesystem_encoding, __version__
from ebook_converter.ebooks.chardet import xml_to_unicode
from ebook_converter.ebooks.conversion.preprocess import CSSPreProcessor
from ebook_converter import (isbytestring, as_unicode, get_types_map)
from ebook_converter import as_unicode, get_types_map
from ebook_converter.ebooks.oeb import parse_utils
from ebook_converter.utils.cleantext import clean_xml_chars
from ebook_converter.utils.short_uuid import uuid4
@@ -501,7 +501,7 @@ class DirContainer(object):
def __init__(self, path, log, ignore_opf=False):
self.log = log
if isbytestring(path):
if isinstance(path, bytes):
path = path.decode(filesystem_encoding)
self.opfname = None
ext = os.path.splitext(path)[1].lower()

4
ebook_converter/ebooks/oeb/stylizer.py
View File

@@ -12,7 +12,7 @@ from css_parser import (profile as cssprofiles, parseString, parseStyle, log as
css_parser_log, CSSParser, profiles, replaceUrls)
from ebook_converter import constants as const
from ebook_converter import force_unicode, as_unicode
from ebook_converter import force_unicode
from ebook_converter.ebooks import unit_convert
from ebook_converter.ebooks.oeb import base
from ebook_converter.ebooks.oeb.normalize_css import DEFAULTS, normalizers
@@ -303,7 +303,7 @@ class Stylizer(object):
try:
matches = tuple(select(text))
except SelectorError as err:
self.logger.error('Ignoring CSS rule with invalid selector: %r (%s)' % (text, as_unicode(err)))
self.logger.error('Ignoring CSS rule with invalid selector: %r (%s)' % (text, err))
continue
if fl is not None: