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

Removing couple of "buildins" polyglot types

Browse Source
This commit is contained in:
gryf
2020-04-20 20:22:50 +02:00
parent eac0b98d6f
commit c867f0321b
36 changed files with 85 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ebook_converter/ebooks/lrf/html/convert_from.py
View File

@@ -37,7 +37,7 @@ from ebook_converter.ebooks.lrf.pylrs.pylrs import (
RuledLine, Span, Sub, Sup, TextBlock
)
from ebook_converter.ptempfile import PersistentTemporaryFile
from ebook_converter.polyglot.builtins import getcwd, itervalues, string_or_bytes
from ebook_converter.polyglot.builtins import getcwd, itervalues
from ebook_converter.polyglot.urllib import unquote
from PIL import Image as PILImage
@@ -1118,7 +1118,7 @@ class HTMLConverter(object):
ans['sidemargin'] = int((factor*int(self.current_block.blockStyle.attrs['blockwidth'])) / 2)
for prop in ('topskip', 'footskip', 'sidemargin'):
if isinstance(ans[prop], string_or_bytes):
if isinstance(ans[prop], (str, bytes)):
ans[prop] = int(ans[prop])
if ans[prop] < 0:
ans[prop] = 0

4
ebook_converter/ebooks/lrf/html/table.py
View File

@@ -4,7 +4,7 @@ from ebook_converter.ebooks.lrf.fonts import get_font
from ebook_converter.ebooks.lrf.pylrs.pylrs import TextBlock, Text, CR, Span, \
CharButton, Plot, Paragraph, \
LrsTextTag
from ebook_converter.polyglot.builtins import string_or_bytes, native_string_type
from ebook_converter.polyglot.builtins import native_string_type
__license__ = 'GPL v3'
@@ -40,7 +40,7 @@ def tokens(tb):
yield 2, None
elif isinstance(x, Text):
yield x.text, cattrs(attrs, {})
elif isinstance(x, string_or_bytes):
elif isinstance(x, (str, bytes)):
yield x, cattrs(attrs, {})
elif isinstance(x, (CharButton, LrsTextTag)):
if x.contents: