Removed overwritten builtins from mosto of the files.

Just started the process of cleaning up the code base.

ebook_converter/utils/cleantext.py

@@ -1,6 +1,6 @@
 import re
 
-from ebook_converter.polyglot.builtins import codepoint_to_chr, map, range, filter
+from ebook_converter.polyglot.builtins import codepoint_to_chr
 from ebook_converter.polyglot.html_entities import name2codepoint
 from ebook_converter.constants import plugins, preferred_encoding
 

ebook_converter/utils/config_base.py

@@ -10,7 +10,7 @@ import pkg_resources
 
 from ebook_converter.utils.lock import ExclusiveFile
 from ebook_converter.constants import config_dir, CONFIG_DIR_MODE, ispy3, preferred_encoding, filesystem_encoding, iswindows
-from ebook_converter.polyglot.builtins import unicode_type, iteritems, map
+from ebook_converter.polyglot.builtins import unicode_type, iteritems
 
 plugin_dir = os.path.join(config_dir, 'plugins')
 

ebook_converter/utils/filenames.py

@@ -13,7 +13,7 @@ from ebook_converter.constants import (
     filesystem_encoding, iswindows, plugins, preferred_encoding, isosx, ispy3
 )
 from ebook_converter.utils.localization import get_udc
-from ebook_converter.polyglot.builtins import iteritems, itervalues, unicode_type, range
+from ebook_converter.polyglot.builtins import iteritems, itervalues, unicode_type
 
 
 def ascii_text(orig):

ebook_converter/utils/fonts/metadata.py

@@ -3,7 +3,7 @@ from struct import calcsize, unpack, unpack_from
 from collections import namedtuple
 
 from ebook_converter.utils.fonts.utils import get_font_names2, get_font_characteristics
-from ebook_converter.polyglot.builtins import range, unicode_type
+from ebook_converter.polyglot.builtins import unicode_type
 
 
 __license__ = 'GPL v3'

ebook_converter/utils/fonts/scanner.py

@@ -6,7 +6,7 @@ from ebook_converter import walk, prints, as_unicode
 from ebook_converter.constants import (config_dir, iswindows, isosx, plugins, DEBUG,
         isworker, filesystem_encoding)
 from ebook_converter.utils.fonts.metadata import FontMetadata, UnsupportedFont
-from ebook_converter.polyglot.builtins import itervalues, unicode_type, filter
+from ebook_converter.polyglot.builtins import itervalues, unicode_type
 
 
 __license__ = 'GPL v3'

ebook_converter/utils/fonts/sfnt/cff/dict_data.py

@@ -1,5 +1,5 @@
 from struct import pack, unpack_from
-from ebook_converter.polyglot.builtins import range, unicode_type
+from ebook_converter.polyglot.builtins import unicode_type
 
 
 __license__ = 'GPL v3'

ebook_converter/utils/fonts/sfnt/cff/table.py

@@ -6,7 +6,7 @@ from ebook_converter.utils.fonts.sfnt.errors import UnsupportedFont, NoGlyphs
 from ebook_converter.utils.fonts.sfnt.cff.dict_data import TopDict, PrivateDict
 from ebook_converter.utils.fonts.sfnt.cff.constants import (cff_standard_strings,
         STANDARD_CHARSETS)
-from ebook_converter.polyglot.builtins import iteritems, itervalues, range
+from ebook_converter.polyglot.builtins import iteritems, itervalues
 
 
 __license__ = 'GPL v3'

ebook_converter/utils/fonts/sfnt/cmap.py

@@ -4,7 +4,6 @@ from collections import OrderedDict
 from ebook_converter.utils.fonts.utils import read_bmp_prefix
 from ebook_converter.utils.fonts.sfnt import UnknownTable, max_power_of_two
 from ebook_converter.utils.fonts.sfnt.errors import UnsupportedFont
-from ebook_converter.polyglot.builtins import range
 
 
 __license__ = 'GPL v3'

ebook_converter/utils/fonts/sfnt/common.py

@@ -2,7 +2,7 @@ from struct import unpack_from, calcsize
 from collections import OrderedDict, namedtuple
 
 from ebook_converter.utils.fonts.sfnt.errors import UnsupportedFont
-from ebook_converter.polyglot.builtins import range, iteritems
+from ebook_converter.polyglot.builtins import iteritems
 
 
 __license__ = 'GPL v3'

ebook_converter/utils/fonts/sfnt/head.py

@@ -3,7 +3,6 @@ from struct import unpack_from, pack, calcsize
 from ebook_converter.utils.fonts.sfnt import UnknownTable, DateTimeProperty, FixedProperty
 from ebook_converter.utils.fonts.sfnt.errors import UnsupportedFont
 from ebook_converter.utils.fonts.sfnt.loca import read_array
-from ebook_converter.polyglot.builtins import zip
 
 
 __license__ = 'GPL v3'

ebook_converter/utils/fonts/sfnt/kern.py

@@ -3,7 +3,6 @@ from struct import unpack_from, calcsize, pack, error as struct_error
 from ebook_converter.utils.fonts.sfnt import (UnknownTable, FixedProperty,
         max_power_of_two)
 from ebook_converter.utils.fonts.sfnt.errors import UnsupportedFont
-from ebook_converter.polyglot.builtins import range
 
 
 __license__ = 'GPL v3'

ebook_converter/utils/fonts/sfnt/loca.py

@@ -3,7 +3,7 @@ from operator import itemgetter
 from itertools import repeat
 
 from ebook_converter.utils.fonts.sfnt import UnknownTable
-from ebook_converter.polyglot.builtins import iteritems, range
+from ebook_converter.polyglot.builtins import iteritems
 
 
 __license__ = 'GPL v3'

ebook_converter/utils/fonts/sfnt/maxp.py

@@ -2,7 +2,6 @@ from struct import unpack_from, pack
 
 from ebook_converter.utils.fonts.sfnt import UnknownTable, FixedProperty
 from ebook_converter.utils.fonts.sfnt.errors import UnsupportedFont
-from ebook_converter.polyglot.builtins import zip
 
 
 __license__ = 'GPL v3'

ebook_converter/utils/fonts/sfnt/subset.py

@@ -6,7 +6,7 @@ from functools import partial
 from ebook_converter.utils.icu import safe_chr, ord_string
 from ebook_converter.utils.fonts.sfnt.container import Sfnt
 from ebook_converter.utils.fonts.sfnt.errors import UnsupportedFont, NoGlyphs
-from ebook_converter.polyglot.builtins import unicode_type, range, iteritems, itervalues, map
+from ebook_converter.polyglot.builtins import unicode_type, iteritems, itervalues
 
 
 __license__ = 'GPL v3'

ebook_converter/utils/fonts/utils.py

@@ -2,7 +2,7 @@ import struct
 from io import BytesIO
 from collections import defaultdict
 
-from ebook_converter.polyglot.builtins import iteritems, itervalues, unicode_type, range, as_bytes
+from ebook_converter.polyglot.builtins import iteritems, itervalues, unicode_type, as_bytes
 
 
 __license__ = 'GPL v3'

ebook_converter/utils/icu.py

@@ -5,7 +5,6 @@ import unicodedata
 # Setup code {{{
 from ebook_converter.constants import plugins
 from ebook_converter.polyglot.builtins import unicode_type, cmp
-from ebook_converter.polyglot.builtins import filter
 from ebook_converter.utils.config_base import tweaks
 
 

ebook_converter/utils/resources.py

@@ -6,7 +6,6 @@ __docformat__ = 'restructuredtext en'
 import sys, os
 
 from ebook_converter import config_dir
-from ebook_converter.polyglot.builtins import builtins
 
 
 user_dir = os.path.join(config_dir, 'resources')

ebook_converter/utils/speedups.py

@@ -1,6 +1,6 @@
 import os
 
-from ebook_converter.polyglot.builtins import range, unicode_type
+from ebook_converter.polyglot.builtins import unicode_type
 
 
 class ReadOnlyFileBuffer(object):

ebook_converter/utils/terminal.py

@@ -7,7 +7,7 @@ except ValueError:
     iswindows = False
 
 from ebook_converter.constants import ispy3
-from ebook_converter.polyglot.builtins import iteritems, range, zip, native_string_type
+from ebook_converter.polyglot.builtins import iteritems, native_string_type
 
 
 __license__ = 'GPL v3'

ebook_converter/utils/zipfile.py

@@ -10,7 +10,7 @@ from tempfile import SpooledTemporaryFile
 from ebook_converter import sanitize_file_name
 from ebook_converter.constants import filesystem_encoding
 from ebook_converter.ebooks.chardet import detect
-from ebook_converter.polyglot.builtins import unicode_type, string_or_bytes, getcwd, map, as_bytes
+from ebook_converter.polyglot.builtins import unicode_type, string_or_bytes, getcwd, as_bytes
 
 try:
     import zlib  # We may need its compression method