Removing couple of "buildins" polyglot types

ebook_converter/ebooks/lrf/html/convert_from.py

@@ -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

ebook_converter/ebooks/lrf/html/table.py

@@ -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:

ebook_converter/ebooks/lrf/pylrs/elements.py

@@ -1,7 +1,6 @@
 """
 elements.py -- replacements and helpers for ElementTree
 """
-from ebook_converter.polyglot.builtins import string_or_bytes
 
 
 class ElementWriter(object):
@@ -25,7 +24,7 @@ class ElementWriter(object):
 
     def _writeAttribute(self, f, name, value):
         f.write(' %s="' % str(name))
-        if not isinstance(value, string_or_bytes):
+        if not isinstance(value, (str, bytes)):
             value = str(value)
         value = self._encodeCdata(value)
         value = value.replace('"', '"')

ebook_converter/ebooks/lrf/pylrs/pylrf.py

@@ -9,7 +9,7 @@ import codecs
 import os
 
 from .pylrfopt import tagListOptimizer
-from ebook_converter.polyglot.builtins import iteritems, string_or_bytes
+from ebook_converter.polyglot.builtins import iteritems
 
 PYLRF_VERSION = "1.0"
 
@@ -397,7 +397,7 @@ class LrfTag(object):
         for f in self.format:
             if isinstance(f, dict):
                 p = f[p]
-            elif isinstance(f, string_or_bytes):
+            elif isinstance(f, (str, bytes)):
                 if isinstance(p, tuple):
                     writeString(lrf, struct.pack(f, *p))
                 else:

ebook_converter/ebooks/lrf/pylrs/pylrs.py

@@ -51,7 +51,7 @@ DEFAULT_GENREADING      = "fs"          # default is yes to both lrf and lrs
 
 from ebook_converter import __appname__, __version__
 from ebook_converter import entity_to_unicode
-from ebook_converter.polyglot.builtins import string_or_bytes, iteritems, native_string_type
+from ebook_converter.polyglot.builtins import iteritems, native_string_type
 
 
 class LrsError(Exception):
@@ -90,7 +90,7 @@ def ElementWithReading(tag, text, reading=False):
 
     if text is None:
         readingText = ""
-    elif isinstance(text, string_or_bytes):
+    elif isinstance(text, (str, bytes)):
         readingText = text
     else:
         # assumed to be a sequence of (name, sortas)
@@ -148,7 +148,7 @@ class Delegator(object):
 
             """
             for setting in d.getSettings():
-                if isinstance(setting, string_or_bytes):
+                if isinstance(setting, (str, bytes)):
                     setting = (d, setting)
                 delegates = \
                         self.delegatedSettingsDict.setdefault(setting[1], [])
@@ -286,7 +286,7 @@ class LrsContainer(object):
                     (content.__class__.__name__,
                     self.__class__.__name__))
 
-        if convertText and isinstance(content, string_or_bytes):
+        if convertText and isinstance(content, (str, bytes)):
             content = Text(content)
 
         content.setParent(self)
@@ -580,14 +580,14 @@ class Book(Delegator):
             ts.attrs['baselineskip'] = rescale(ts.attrs['baselineskip'])
 
     def renderLrs(self, lrsFile, encoding="UTF-8"):
-        if isinstance(lrsFile, string_or_bytes):
+        if isinstance(lrsFile, (str, bytes)):
             lrsFile = codecs.open(lrsFile, "wb", encoding=encoding)
         self.render(lrsFile, outputEncodingName=encoding)
         lrsFile.close()
 
     def renderLrf(self, lrfFile):
         self.appendReferencedObjects(self)
-        if isinstance(lrfFile, string_or_bytes):
+        if isinstance(lrfFile, (str, bytes)):
             lrfFile = open(lrfFile, "wb")
         lrfWriter = LrfWriter(self.sourceencoding)
 
@@ -1488,7 +1488,7 @@ class Paragraph(LrsContainer):
         LrsContainer.__init__(self, [Text, CR, DropCaps, CharButton,
                                      LrsSimpleChar1, bytes, str])
         if text is not None:
-            if isinstance(text, string_or_bytes):
+            if isinstance(text, (str, bytes)):
                 text = Text(text)
             self.append(text)
 
@@ -1807,7 +1807,7 @@ class Span(LrsSimpleChar1, LrsContainer):
     def __init__(self, text=None, **attrs):
         LrsContainer.__init__(self, [LrsSimpleChar1, Text, bytes, str])
         if text is not None:
-            if isinstance(text, string_or_bytes):
+            if isinstance(text, (str, bytes)):
                 text = Text(text)
             self.append(text)