Removed overwritten builtins from mosto of the files.

Just started the process of cleaning up the code base.

ebook_converter/ebooks/metadata/__init__.py

@@ -6,7 +6,7 @@ import os, sys, re
 
 from ebook_converter import relpath, guess_type, prints, force_unicode
 from ebook_converter.utils.config_base import tweaks
-from ebook_converter.polyglot.builtins import codepoint_to_chr, unicode_type, range, map, zip, getcwd, iteritems, itervalues, as_unicode
+from ebook_converter.polyglot.builtins import codepoint_to_chr, unicode_type, getcwd, iteritems, itervalues, as_unicode
 from ebook_converter.polyglot.urllib import quote, unquote, urlparse
 
 

ebook_converter/ebooks/metadata/archive.py

@@ -3,7 +3,7 @@ from contextlib import closing
 
 from ebook_converter.customize import FileTypePlugin
 from ebook_converter.utils.localization import canonicalize_lang
-from ebook_converter.polyglot.builtins import filter, unicode_type
+from ebook_converter.polyglot.builtins import unicode_type
 
 
 __license__ = 'GPL v3'

ebook_converter/ebooks/metadata/book/base.py

@@ -7,7 +7,7 @@ from ebook_converter.ebooks.metadata.book import (SC_COPYABLE_FIELDS,
         TOP_LEVEL_IDENTIFIERS, ALL_METADATA_FIELDS)
 from ebook_converter.library.field_metadata import FieldMetadata
 from ebook_converter.utils.icu import sort_key
-from ebook_converter.polyglot.builtins import iteritems, unicode_type, filter, map
+from ebook_converter.polyglot.builtins import iteritems, unicode_type
 
 
 __license__ = 'GPL v3'

ebook_converter/ebooks/metadata/opf2.py

@@ -17,7 +17,7 @@ from ebook_converter import prints, guess_type
 from ebook_converter.utils.cleantext import clean_ascii_chars, clean_xml_chars
 from ebook_converter.utils.config import tweaks
 from ebook_converter.utils.xml_parse import safe_xml_fromstring
-from ebook_converter.polyglot.builtins import iteritems, unicode_type, getcwd, map
+from ebook_converter.polyglot.builtins import iteritems, unicode_type, getcwd
 from ebook_converter.polyglot.urllib import unquote, urlparse
 
 

ebook_converter/ebooks/metadata/opf3.py

@@ -2,7 +2,7 @@ import json
 import re
 from collections import defaultdict, namedtuple
 from functools import wraps
-from ebook_converter.polyglot.builtins import iteritems, map, filter
+from ebook_converter.polyglot.builtins import iteritems
 
 from lxml import etree
 

ebook_converter/ebooks/metadata/rtf.py

@@ -6,7 +6,7 @@ import re
 
 from ebook_converter import force_unicode
 from ebook_converter.ebooks.metadata import MetaInformation
-from ebook_converter.polyglot.builtins import codepoint_to_chr, string_or_bytes, unicode_type, int_to_byte, filter
+from ebook_converter.polyglot.builtins import codepoint_to_chr, string_or_bytes, unicode_type, int_to_byte
 
 title_pat    = re.compile(br'\{\\info.*?\{\\title(.*?)(?<!\\)\}', re.DOTALL)
 author_pat   = re.compile(br'\{\\info.*?\{\\author(.*?)(?<!\\)\}', re.DOTALL)

ebook_converter/ebooks/metadata/utils.py

@@ -7,7 +7,6 @@ from ebook_converter.spell import parse_lang_code
 from ebook_converter.utils.cleantext import clean_xml_chars
 from ebook_converter.utils.localization import lang_as_iso639_1
 from ebook_converter.utils.xml_parse import safe_xml_fromstring
-from ebook_converter.polyglot.builtins import filter, map
 
 
 OPFVersion = namedtuple('OPFVersion', 'major minor patch')

ebook_converter/ebooks/metadata/xmp.py

@@ -12,7 +12,7 @@ from ebook_converter.ebooks.metadata.book.base import Metadata
 from ebook_converter.ebooks.metadata.opf2 import dump_dict
 from ebook_converter.utils.date import parse_date, isoformat, now
 from ebook_converter.utils.localization import canonicalize_lang, lang_as_iso639_1
-from ebook_converter.polyglot.builtins import iteritems, string_or_bytes, filter
+from ebook_converter.polyglot.builtins import iteritems, string_or_bytes
 
 
 __license__ = 'GPL v3'