Removed overwritten builtins from mosto of the files.

Just started the process of cleaning up the code base.

ebook_converter/ebooks/oeb/base.py

@@ -16,7 +16,7 @@ from ebook_converter import (isbytestring, as_unicode, get_types_map)
 from ebook_converter.ebooks.oeb.parse_utils import barename, XHTML_NS, namespace, XHTML, parse_html, NotHTML
 from ebook_converter.utils.cleantext import clean_xml_chars
 from ebook_converter.utils.short_uuid import uuid4
-from ebook_converter.polyglot.builtins import iteritems, unicode_type, string_or_bytes, range, itervalues, filter, codepoint_to_chr
+from ebook_converter.polyglot.builtins import iteritems, unicode_type, string_or_bytes, itervalues, codepoint_to_chr
 from ebook_converter.polyglot.urllib import unquote as urlunquote, urldefrag, urljoin, urlparse, urlunparse
 
 

ebook_converter/ebooks/oeb/normalize_css.py

@@ -5,7 +5,7 @@ from css_parser.css import PropertyValue
 from css_parser import profile as cssprofiles, CSSParser
 from ebook_converter.tinycss.fonts3 import parse_font, serialize_font_family
 from ebook_converter.ebooks.oeb.base import css_text
-from ebook_converter.polyglot.builtins import iteritems, string_or_bytes, unicode_type, zip
+from ebook_converter.polyglot.builtins import iteritems, string_or_bytes, unicode_type
 
 
 __license__ = 'GPL v3'

ebook_converter/ebooks/oeb/parse_utils.py

@@ -6,7 +6,7 @@ from ebook_converter import xml_replace_entities, force_unicode
 from ebook_converter.utils.xml_parse import safe_xml_fromstring
 from ebook_converter.constants import filesystem_encoding
 from ebook_converter.ebooks.chardet import xml_to_unicode, strip_encoding_declarations
-from ebook_converter.polyglot.builtins import iteritems, itervalues, unicode_type, string_or_bytes, map
+from ebook_converter.polyglot.builtins import iteritems, itervalues, unicode_type, string_or_bytes
 
 
 __license__ = 'GPL v3'

ebook_converter/ebooks/oeb/polish/container.py

@@ -48,7 +48,7 @@ from ebook_converter.utils.ipc.simple_worker import WorkerError, fork_job
 from ebook_converter.utils.logging import default_log
 from ebook_converter.utils.xml_parse import safe_xml_fromstring
 from ebook_converter.utils.zipfile import ZipFile
-from ebook_converter.polyglot.builtins import iteritems, map, unicode_type, zip
+from ebook_converter.polyglot.builtins import iteritems, unicode_type
 from ebook_converter.polyglot.urllib import urlparse
 
 exists, join, relpath = os.path.exists, os.path.join, os.path.relpath

ebook_converter/ebooks/oeb/polish/css.py

@@ -10,7 +10,7 @@ from ebook_converter.ebooks.oeb.normalize_css import normalize_filter_css, norma
 from ebook_converter.ebooks.oeb.polish.pretty import pretty_script_or_style, pretty_xml_tree, serialize
 from ebook_converter.utils.icu import numeric_sort_key
 from ebook_converter.css_selectors import Select, SelectorError
-from ebook_converter.polyglot.builtins import iteritems, itervalues, unicode_type, filter
+from ebook_converter.polyglot.builtins import iteritems, itervalues, unicode_type
 
 
 __license__ = 'GPL v3'

ebook_converter/ebooks/oeb/polish/pretty.py

@@ -1,5 +1,5 @@
 import textwrap
-from ebook_converter.polyglot.builtins import iteritems, map
+from ebook_converter.polyglot.builtins import iteritems
 
 # from lxml.etree import Element
 

ebook_converter/ebooks/oeb/polish/replace.py

@@ -1,5 +1,5 @@
 import codecs, shutil, os, posixpath
-from ebook_converter.polyglot.builtins import iteritems, itervalues, map
+from ebook_converter.polyglot.builtins import iteritems, itervalues
 from functools import partial
 from collections import Counter, defaultdict
 

ebook_converter/ebooks/oeb/polish/split.py

@@ -1,5 +1,5 @@
 import copy, os, re
-from ebook_converter.polyglot.builtins import map, string_or_bytes, range
+from ebook_converter.polyglot.builtins import string_or_bytes
 
 from ebook_converter.ebooks.oeb.base import barename, XPNSMAP, XPath, OPF, XHTML, OEB_DOCS
 from ebook_converter.ebooks.oeb.polish.errors import MalformedMarkup

ebook_converter/ebooks/oeb/polish/toc.py

@@ -15,7 +15,7 @@ from ebook_converter.ebooks.oeb.polish.utils import guess_type, extract
 from ebook_converter.ebooks.oeb.polish.opf import set_guide_item, get_book_language
 from ebook_converter.ebooks.oeb.polish.pretty import pretty_html_tree
 from ebook_converter.utils.localization import get_lang, canonicalize_lang, lang_as_iso639_1
-from ebook_converter.polyglot.builtins import iteritems, map, unicode_type
+from ebook_converter.polyglot.builtins import iteritems, unicode_type
 from ebook_converter.polyglot.urllib import urlparse
 
 

ebook_converter/ebooks/oeb/polish/utils.py

@@ -2,7 +2,6 @@ import re, os
 from bisect import bisect
 
 from ebook_converter import guess_type as _guess_type, replace_entities
-from ebook_converter.polyglot.builtins import filter
 
 
 __license__ = 'GPL v3'

ebook_converter/ebooks/oeb/reader.py

@@ -22,7 +22,7 @@ from ebook_converter.utils.localization import get_lang
 from ebook_converter.ptempfile import TemporaryDirectory
 from ebook_converter.constants import __appname__, __version__
 from ebook_converter import guess_type, xml_replace_entities
-from ebook_converter.polyglot.builtins import unicode_type, zip
+from ebook_converter.polyglot.builtins import unicode_type
 from ebook_converter.polyglot.urllib import unquote, urldefrag, urlparse
 
 

ebook_converter/ebooks/oeb/stylizer.py

@@ -15,7 +15,7 @@ from ebook_converter.ebooks import unit_convert
 from ebook_converter.ebooks.oeb.base import XHTML, XHTML_NS, CSS_MIME, OEB_STYLES, xpath, urlnormalize
 from ebook_converter.ebooks.oeb.normalize_css import DEFAULTS, normalizers
 from ebook_converter.css_selectors import Select, SelectorError, INAPPROPRIATE_PSEUDO_CLASSES
-from ebook_converter.polyglot.builtins import iteritems, unicode_type, filter
+from ebook_converter.polyglot.builtins import iteritems, unicode_type
 from ebook_converter.tinycss.media3 import CSSMedia3Parser
 
 

ebook_converter/ebooks/oeb/transforms/flatcss.py

@@ -16,7 +16,7 @@ from ebook_converter.ebooks.oeb.base import (XHTML, XHTML_NS, CSS_MIME, OEB_STYL
 from ebook_converter.ebooks.oeb.stylizer import Stylizer
 from ebook_converter.utils.filenames import ascii_filename, ascii_text
 from ebook_converter.utils.icu import numeric_sort_key
-from ebook_converter.polyglot.builtins import iteritems, unicode_type, string_or_bytes, map
+from ebook_converter.polyglot.builtins import iteritems, unicode_type, string_or_bytes
 
 
 __license__ = 'GPL v3'

ebook_converter/ebooks/oeb/transforms/jacket.py

@@ -10,7 +10,7 @@ from ebook_converter.library.comments import comments_to_html, markdown
 from ebook_converter.utils.date import is_date_undefined, as_local_time
 from ebook_converter.ebooks.chardet import strip_encoding_declarations
 from ebook_converter.ebooks.metadata import fmt_sidx, rating_to_stars
-from ebook_converter.polyglot.builtins import unicode_type, map
+from ebook_converter.polyglot.builtins import unicode_type
 
 
 __license__ = 'GPL v3'

ebook_converter/ebooks/oeb/transforms/split.py

@@ -14,7 +14,7 @@ from ebook_converter.ebooks.epub import rules
 from ebook_converter.ebooks.oeb.base import (OEB_STYLES, XPNSMAP as NAMESPACES,
         urldefrag, rewrite_links, XHTML, urlnormalize)
 from ebook_converter.ebooks.oeb.polish.split import do_split
-from ebook_converter.polyglot.builtins import iteritems, range, map, unicode_type
+from ebook_converter.polyglot.builtins import iteritems, unicode_type
 from ebook_converter.polyglot.urllib import unquote
 from ebook_converter.css_selectors import Select, SelectorError
 

ebook_converter/ebooks/oeb/transforms/subset.py

@@ -2,7 +2,7 @@ from collections import defaultdict
 
 from ebook_converter.ebooks.oeb.base import urlnormalize, css_text
 from ebook_converter.utils.fonts.sfnt.subset import subset, NoGlyphs, UnsupportedFont
-from ebook_converter.polyglot.builtins import iteritems, itervalues, unicode_type, range
+from ebook_converter.polyglot.builtins import iteritems, itervalues, unicode_type
 from ebook_converter.tinycss.fonts3 import parse_font_family