py3 porting cleanup: remove unneeded indirect import of builtins

filter, map, range, and zip were proxied through polyglot.builtins to
ensure that their `future_builtins` forms were used. In python3 this is
no longer needed and they don't need to be imported at all, from
anywhere. So, don't.

setup/browser_data.py

@@ -9,7 +9,6 @@ import sys
 from datetime import datetime
 from urllib.request import urlopen
 
-from polyglot.builtins import filter
 from setup import download_securely
 
 

setup/translations.py

@@ -13,7 +13,7 @@ from functools import partial
 
 from setup import Command, __appname__, __version__, require_git_master, build_cache_dir, edit_file, dump_json
 from setup.parallel_build import batched_parallel_jobs
-from polyglot.builtins import codepoint_to_chr, iteritems, range
+from polyglot.builtins import codepoint_to_chr, iteritems
 is_ci = os.environ.get('CI', '').lower() == 'true'
 
 

src/calibre/__init__.py

@@ -5,7 +5,7 @@ __copyright__ = '2008, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
 import sys, os, re, time, random, warnings
-from polyglot.builtins import codepoint_to_chr, unicode_type, range, hasenv, native_string_type
+from polyglot.builtins import codepoint_to_chr, unicode_type, hasenv, native_string_type
 from math import floor
 from functools import partial
 

src/calibre/constants.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim:fileencoding=utf-8
 # License: GPLv3 Copyright: 2015, Kovid Goyal <kovid at kovidgoyal.net>
-from polyglot.builtins import map, unicode_type, environ_item, hasenv, getenv
+from polyglot.builtins import unicode_type, environ_item, hasenv, getenv
 import sys, locale, codecs, os, collections, collections.abc
 
 __appname__   = 'calibre'

src/calibre/customize/profiles.py

@@ -5,7 +5,6 @@ __copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
 from calibre.customize import Plugin as _Plugin
-from polyglot.builtins import zip
 
 FONT_SIZES = [('xx-small', 1),
               ('x-small',  None),

src/calibre/customize/zipplugin.py

@@ -22,7 +22,7 @@ from calibre import as_unicode
 from calibre.customize import (
     InvalidPlugin, Plugin, PluginNotFound, numeric_version, platform
 )
-from polyglot.builtins import itervalues, map, reload, string_or_bytes, unicode_type
+from polyglot.builtins import itervalues, reload, string_or_bytes, unicode_type
 
 # PEP 302 based plugin loading mechanism, works around the bug in zipimport in
 # python 2.x that prevents importing from zip files in locations whose paths

src/calibre/db/__init__.py

@@ -9,7 +9,7 @@ __docformat__ = 'restructuredtext en'
 SPOOL_SIZE = 30*1024*1024
 
 import numbers
-from polyglot.builtins import iteritems, range
+from polyglot.builtins import iteritems
 
 
 def _get_next_series_num_for_list(series_indices, unwrap=True):

src/calibre/db/adding.py

@@ -16,7 +16,7 @@ from calibre import prints
 from calibre.constants import filesystem_encoding, ismacos, iswindows
 from calibre.ebooks import BOOK_EXTENSIONS
 from calibre.utils.filenames import make_long_path_useable
-from polyglot.builtins import itervalues, map as it_map, unicode_type
+from polyglot.builtins import itervalues, unicode_type
 
 
 def splitext(path):
@@ -71,7 +71,7 @@ def metadata_extensions():
     # but not actually added)
     global _metadata_extensions
     if _metadata_extensions is None:
-        _metadata_extensions =  frozenset(it_map(unicode_type, BOOK_EXTENSIONS)) | {'opf'}
+        _metadata_extensions =  frozenset(map(unicode_type, BOOK_EXTENSIONS)) | {'opf'}
     return _metadata_extensions
 
 

src/calibre/db/cache.py

@@ -47,9 +47,7 @@ from calibre.utils.config import prefs, tweaks
 from calibre.utils.date import UNDEFINED_DATE, now as nowf, utcnow
 from calibre.utils.icu import sort_key
 from calibre.utils.localization import canonicalize_lang
-from polyglot.builtins import (
+from polyglot.builtins import cmp, iteritems, itervalues, string_or_bytes, unicode_type
-    cmp, iteritems, itervalues, string_or_bytes, unicode_type, zip
-)
 
 
 def api(f):

src/calibre/db/categories.py

@@ -8,7 +8,7 @@ __docformat__ = 'restructuredtext en'
 
 import copy
 from functools import partial
-from polyglot.builtins import iteritems, unicode_type, map, native_string_type
+from polyglot.builtins import iteritems, unicode_type, native_string_type
 
 from calibre.ebooks.metadata import author_to_author_sort
 from calibre.utils.config_base import tweaks

src/calibre/db/cli/cmd_list.py

@@ -11,7 +11,7 @@ from textwrap import TextWrapper
 from calibre.db.cli.utils import str_width
 from calibre.ebooks.metadata import authors_to_string
 from calibre.utils.date import isoformat
-from polyglot.builtins import as_bytes, iteritems, map, unicode_type
+from polyglot.builtins import as_bytes, iteritems, unicode_type
 
 readonly = True
 version = 0  # change this if you change signature of implementation()

src/calibre/db/cli/cmd_list_categories.py

@@ -8,7 +8,7 @@ import sys
 from textwrap import TextWrapper
 
 from calibre import prints
-from polyglot.builtins import as_bytes, map, unicode_type
+from polyglot.builtins import as_bytes, unicode_type
 
 readonly = True
 version = 0  # change this if you change signature of implementation()

src/calibre/db/cli/utils.py

@@ -3,8 +3,6 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>
 
 
-from polyglot.builtins import map
-
 import unicodedata
 
 eaw = unicodedata.east_asian_width

src/calibre/db/legacy.py

@@ -6,7 +6,7 @@ __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import os, traceback, weakref
-from polyglot.builtins import iteritems, zip
+from polyglot.builtins import iteritems
 from collections.abc import MutableMapping
 
 from calibre import force_unicode, isbytestring

src/calibre/db/restore.py

@@ -17,7 +17,7 @@ from calibre.db.cache import Cache
 from calibre.constants import filesystem_encoding
 from calibre.utils.date import utcfromtimestamp
 from calibre import isbytestring, force_unicode
-from polyglot.builtins import iteritems, filter
+from polyglot.builtins import iteritems
 
 NON_EBOOK_EXTENSIONS = frozenset((
     'jpg', 'jpeg', 'gif', 'png', 'bmp',

src/calibre/db/tables.py

@@ -12,7 +12,7 @@ from collections import defaultdict
 
 from calibre.utils.date import parse_date, UNDEFINED_DATE, utc_tz
 from calibre.ebooks.metadata import author_to_author_sort
-from polyglot.builtins import iteritems, itervalues, range
+from polyglot.builtins import iteritems, itervalues
 from calibre_extensions.speedup import parse_date as _c_speedup
 
 

src/calibre/db/tests/base.py

@@ -9,7 +9,7 @@ __docformat__ = 'restructuredtext en'
 import unittest, os, shutil, tempfile, atexit, gc, time
 from functools import partial
 from io import BytesIO
-from polyglot.builtins import map, unicode_type
+from polyglot.builtins import unicode_type
 
 rmtree = partial(shutil.rmtree, ignore_errors=True)
 

src/calibre/db/tests/legacy.py

@@ -12,7 +12,7 @@ from operator import itemgetter
 
 from calibre.library.field_metadata import fm_as_dict
 from calibre.db.tests.base import BaseTest
-from polyglot.builtins import iteritems, range, unicode_type, zip
+from polyglot.builtins import iteritems, unicode_type
 from polyglot import reprlib
 
 # Utils {{{

src/calibre/db/tests/locking.py

@@ -9,7 +9,6 @@ import time, random
 from threading import Thread
 from calibre.db.tests.base import BaseTest
 from calibre.db.locking import SHLock, RWLockWrapper, LockingError
-from polyglot.builtins import range
 
 
 def wait_for(period):

src/calibre/db/tests/reading.py

@@ -13,7 +13,7 @@ from time import time
 from calibre.utils.date import utc_tz
 from calibre.utils.localization import calibre_langcode_to_name
 from calibre.db.tests.base import BaseTest
-from polyglot.builtins import iteritems, itervalues, range
+from polyglot.builtins import iteritems, itervalues
 
 
 def p(x):

src/calibre/db/utils.py

@@ -8,7 +8,7 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 import os, errno, sys, re
 from locale import localeconv
 from collections import OrderedDict, namedtuple
-from polyglot.builtins import iteritems, itervalues, map, unicode_type, string_or_bytes, filter
+from polyglot.builtins import iteritems, itervalues, unicode_type, string_or_bytes
 from threading import Lock
 
 from calibre import as_unicode, prints

src/calibre/db/view.py

@@ -8,8 +8,7 @@ __docformat__ = 'restructuredtext en'
 
 import weakref, operator, numbers
 from functools import partial
-from polyglot.builtins import (iteritems, itervalues, map,
+from polyglot.builtins import iteritems, itervalues, unicode_type
-        unicode_type, range)
 
 from calibre.ebooks.metadata import title_sort
 from calibre.utils.config_base import tweaks, prefs

src/calibre/db/write.py

@@ -9,7 +9,7 @@ __docformat__ = 'restructuredtext en'
 import re
 from functools import partial
 from datetime import datetime
-from polyglot.builtins import iteritems, itervalues, unicode_type, zip
+from polyglot.builtins import iteritems, itervalues, unicode_type
 
 from calibre.constants import preferred_encoding
 from calibre.ebooks.metadata import author_to_author_sort, title_sort

src/calibre/devices/__init__.py

@@ -8,7 +8,7 @@ Device drivers.
 
 import sys, time, pprint
 from functools import partial
-from polyglot.builtins import zip, unicode_type
+from polyglot.builtins import unicode_type
 
 DAY_MAP   = dict(Sun=0, Mon=1, Tue=2, Wed=3, Thu=4, Fri=5, Sat=6)
 MONTH_MAP = dict(Jan=1, Feb=2, Mar=3, Apr=4, May=5, Jun=6, Jul=7, Aug=8, Sep=9, Oct=10, Nov=11, Dec=12)

src/calibre/devices/jetbook/driver.py

@@ -15,7 +15,7 @@ import re
 from calibre.constants import filesystem_encoding
 from calibre.devices.usbms.driver import USBMS
 from calibre.ebooks.metadata import string_to_authors
-from polyglot.builtins import unicode_type, map
+from polyglot.builtins import unicode_type
 
 
 class JETBOOK(USBMS):

src/calibre/devices/kindle/apnx.py

@@ -18,7 +18,7 @@ from calibre.ebooks.mobi.reader.headers import MetadataHeader
 from calibre.utils.logging import default_log
 from calibre import prints, fsync
 from calibre.constants import DEBUG
-from polyglot.builtins import range, as_unicode, as_bytes, unicode_type, map
+from polyglot.builtins import as_unicode, as_bytes, unicode_type
 
 
 class APNXBuilder:

src/calibre/devices/mtp/driver.py

@@ -16,7 +16,7 @@ from calibre.devices.mtp.base import debug
 from calibre.devices.mtp.defaults import DeviceDefaults
 from calibre.ptempfile import SpooledTemporaryFile, PersistentTemporaryDirectory
 from calibre.utils.filenames import shorten_components_to
-from polyglot.builtins import iteritems, itervalues, unicode_type, zip, as_bytes
+from polyglot.builtins import iteritems, itervalues, unicode_type, as_bytes
 
 BASE = importlib.import_module('calibre.devices.mtp.%s.driver'%(
     'windows' if iswindows else 'unix')).MTP_DEVICE

src/calibre/devices/mtp/filesystem_cache.py

@@ -9,7 +9,7 @@ __docformat__ = 'restructuredtext en'
 import weakref, sys, json
 from collections import deque
 from operator import attrgetter
-from polyglot.builtins import itervalues, map, unicode_type
+from polyglot.builtins import itervalues, unicode_type
 from datetime import datetime
 
 from calibre import human_readable, prints, force_unicode

src/calibre/devices/mtp/test.py

@@ -12,7 +12,6 @@ from calibre.constants import iswindows, islinux
 from calibre.utils.icu import lower
 from calibre.devices.mtp.driver import MTP_DEVICE
 from calibre.devices.scanner import DeviceScanner
-from polyglot.builtins import range
 
 
 class ProgressCallback:

src/calibre/devices/mtp/windows/driver.py

@@ -8,7 +8,7 @@ __docformat__ = 'restructuredtext en'
 
 import time, threading, traceback
 from functools import wraps, partial
-from polyglot.builtins import iteritems, itervalues, unicode_type, zip
+from polyglot.builtins import iteritems, itervalues, unicode_type
 from itertools import chain
 
 from calibre import as_unicode, prints, force_unicode

src/calibre/devices/prs505/sony_cache.py

@@ -17,7 +17,7 @@ from calibre.ebooks.chardet import xml_to_unicode
 from calibre.ebooks.metadata import authors_to_string, title_sort, \
                                     authors_to_sort_string
 from polyglot.binary import from_base64_bytes
-from polyglot.builtins import unicode_type, zip
+from polyglot.builtins import unicode_type
 
 '''
 cacheExt.xml

src/calibre/devices/scanner.py

@@ -13,7 +13,6 @@ from threading import Lock
 from calibre import prints, as_unicode
 from calibre.constants import (iswindows, ismacos, islinux, isfreebsd,
         isnetbsd)
-from polyglot.builtins import range
 
 osx_scanner = linux_scanner = freebsd_scanner = netbsd_scanner = None
 

src/calibre/devices/usbms/device.py

@@ -27,7 +27,7 @@ from calibre.devices.errors import DeviceError
 from calibre.devices.interface import DevicePlugin
 from calibre.devices.usbms.deviceconfig import DeviceConfig
 from calibre.utils.filenames import ascii_filename as sanitize
-from polyglot.builtins import iteritems, map, string_or_bytes
+from polyglot.builtins import iteritems, string_or_bytes
 
 if ismacos:
     osx_sanitize_name_pat = re.compile(r'[.-]')

src/calibre/devices/usbms/driver.py

@@ -21,7 +21,7 @@ from calibre.devices.usbms.cli import CLI
 from calibre.devices.usbms.device import Device
 from calibre.devices.usbms.books import BookList, Book
 from calibre.ebooks.metadata.book.json_codec import JsonCodec
-from polyglot.builtins import itervalues, unicode_type, string_or_bytes, zip
+from polyglot.builtins import itervalues, unicode_type, string_or_bytes
 
 
 def debug_print(*args, **kw):

src/calibre/devices/winusb.py

@@ -13,7 +13,7 @@ from ctypes import (
 )
 from ctypes.wintypes import DWORD, WORD, ULONG, LPCWSTR, HWND, BOOL, LPWSTR, UINT, BYTE, HANDLE, USHORT
 from pprint import pprint, pformat
-from polyglot.builtins import iteritems, itervalues, map, filter
+from polyglot.builtins import iteritems, itervalues
 
 from calibre import prints, as_unicode
 

src/calibre/ebooks/comic/input.py

@@ -16,7 +16,7 @@ from calibre.ptempfile import PersistentTemporaryDirectory
 from calibre.utils.icu import numeric_sort_key
 from calibre.utils.ipc.server import Server
 from calibre.utils.ipc.job import ParallelJob
-from polyglot.builtins import unicode_type, map
+from polyglot.builtins import unicode_type
 from polyglot.queue import Empty
 
 # If the specified screen has either dimension larger than this value, no image

src/calibre/ebooks/compression/palmdoc.py

@@ -8,7 +8,6 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 import io
 from struct import pack
 
-from polyglot.builtins import range
 from calibre_extensions import cPalmdoc
 
 

src/calibre/ebooks/compression/tcr.py

@@ -6,7 +6,7 @@ __copyright__ = '2009, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
 
 import re
-from polyglot.builtins import int_to_byte, range
+from polyglot.builtins import int_to_byte
 
 
 class TCRCompressor:

src/calibre/ebooks/conversion/plugins/comic_input.py

@@ -13,7 +13,7 @@ import shutil, textwrap, codecs, os
 from calibre.customize.conversion import InputFormatPlugin, OptionRecommendation
 from calibre import CurrentDir
 from calibre.ptempfile import PersistentTemporaryDirectory
-from polyglot.builtins import getcwd, map
+from polyglot.builtins import getcwd
 
 
 class ComicInput(InputFormatPlugin):

src/calibre/ebooks/conversion/plugins/epub_output.py

@@ -12,7 +12,7 @@ from calibre.customize.conversion import (OutputFormatPlugin,
         OptionRecommendation)
 from calibre.ptempfile import TemporaryDirectory
 from calibre import CurrentDir
-from polyglot.builtins import unicode_type, filter, map, zip, range, as_bytes
+from polyglot.builtins import unicode_type, as_bytes
 
 block_level_tags = (
       'address',

src/calibre/ebooks/conversion/plugins/html_input.py

@@ -17,7 +17,7 @@ from calibre.customize.conversion import InputFormatPlugin, OptionRecommendation
 from calibre.utils.filenames import ascii_filename
 from calibre.utils.imghdr import what
 from calibre.utils.localization import get_lang
-from polyglot.builtins import as_unicode, getcwd, unicode_type, zip
+from polyglot.builtins import as_unicode, getcwd, unicode_type
 
 
 def sanitize_file_name(x):

src/calibre/ebooks/conversion/plugins/rtf_input.py

@@ -5,7 +5,7 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 import os, glob, re, textwrap
 
 from calibre.customize.conversion import InputFormatPlugin, OptionRecommendation
-from polyglot.builtins import iteritems, filter, getcwd, as_bytes
+from polyglot.builtins import iteritems, getcwd, as_bytes
 
 border_style_map = {
         'single' : 'solid',

src/calibre/ebooks/conversion/plumber.py

@@ -20,7 +20,7 @@ from calibre.utils.zipfile import ZipFile
 from calibre import (extract, walk, isbytestring, filesystem_encoding,
         get_types_map)
 from calibre.constants import __version__
-from polyglot.builtins import unicode_type, string_or_bytes, map
+from polyglot.builtins import unicode_type, string_or_bytes
 
 DEBUG_README=b'''
 This debug folder contains snapshots of the e-book as it passes through the

src/calibre/ebooks/conversion/preprocess.py

@@ -10,7 +10,7 @@ import functools, re, json
 from math import ceil
 
 from calibre import entity_to_unicode, as_unicode
-from polyglot.builtins import unicode_type, range
+from polyglot.builtins import unicode_type
 
 XMLDECL_RE    = re.compile(r'^\s*<[?]xml.*?[?]>')
 SVG_NS       = 'http://www.w3.org/2000/svg'

src/calibre/ebooks/covers.py

@@ -9,7 +9,7 @@ import re, random, unicodedata, numbers
 from collections import namedtuple
 from contextlib import contextmanager
 from math import ceil, sqrt, cos, sin, atan2
-from polyglot.builtins import iteritems, itervalues, map, zip, string_or_bytes
+from polyglot.builtins import iteritems, itervalues, string_or_bytes
 from itertools import chain
 
 from qt.core import (

src/calibre/ebooks/djvu/djvubzzdec.py

@@ -2,7 +2,6 @@
 # coding: utf-8
 
 
-from polyglot.builtins import range
 
 __license__   = 'GPL v3'
 __copyright__ = '2011, Anthon van der Neut <A.van.der.Neut@ruamel.eu>'

src/calibre/ebooks/docx/cleanup.py

@@ -6,7 +6,7 @@ __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import os
-from polyglot.builtins import itervalues, range
+from polyglot.builtins import itervalues
 
 NBSP = '\xa0'
 

src/calibre/ebooks/docx/fonts.py

@@ -13,7 +13,7 @@ from calibre.utils.filenames import ascii_filename
 from calibre.utils.fonts.scanner import font_scanner, NoFonts
 from calibre.utils.fonts.utils import panose_to_css_generic_family, is_truetype_font
 from calibre.utils.icu import ord_string
-from polyglot.builtins import codepoint_to_chr, iteritems, range
+from polyglot.builtins import codepoint_to_chr, iteritems
 
 Embed = namedtuple('Embed', 'name key subsetted')
 

src/calibre/ebooks/docx/index.py

@@ -10,7 +10,7 @@ from operator import itemgetter
 from lxml import etree
 
 from calibre.utils.icu import partition_by_first_letter, sort_key
-from polyglot.builtins import iteritems, filter
+from polyglot.builtins import iteritems
 
 
 def get_applicable_xe_fields(index, xe_fields, XPath, expand):

src/calibre/ebooks/docx/tables.py

@@ -9,7 +9,7 @@ from lxml.html.builder import TABLE, TR, TD
 
 from calibre.ebooks.docx.block_styles import inherit, read_shd as rs, read_border, binary_property, border_props, ParagraphStyle, border_to_css
 from calibre.ebooks.docx.char_styles import RunStyle
-from polyglot.builtins import filter, iteritems, itervalues, range, unicode_type
+from polyglot.builtins import iteritems, itervalues, unicode_type
 
 # Read from XML {{{
 read_shd = rs

src/calibre/ebooks/docx/to_html.py

@@ -28,7 +28,7 @@ from calibre.ebooks.docx.fields import Fields
 from calibre.ebooks.docx.settings import Settings
 from calibre.ebooks.metadata.opf2 import OPFCreator
 from calibre.utils.localization import canonicalize_lang, lang_as_iso639_1
-from polyglot.builtins import iteritems, itervalues, filter, getcwd, map, unicode_type
+from polyglot.builtins import iteritems, itervalues, getcwd, unicode_type
 
 
 NBSP = '\xa0'

src/calibre/ebooks/docx/toc.py

@@ -12,7 +12,7 @@ from lxml.etree import tostring
 
 from calibre.ebooks.metadata.toc import TOC
 from calibre.ebooks.oeb.polish.toc import elem_to_toc_text
-from polyglot.builtins import iteritems, range
+from polyglot.builtins import iteritems
 
 
 def from_headings(body, log, namespace, num_levels=3):

src/calibre/ebooks/docx/writer/container.py

@@ -18,7 +18,7 @@ from calibre.ebooks.pdf.render.common import PAPER_SIZES
 from calibre.utils.date import utcnow
 from calibre.utils.localization import canonicalize_lang, lang_as_iso639_1
 from calibre.utils.zipfile import ZipFile
-from polyglot.builtins import iteritems, map, unicode_type, native_string_type
+from polyglot.builtins import iteritems, unicode_type, native_string_type
 
 
 def xml2str(root, pretty_print=False, with_tail=False):

src/calibre/ebooks/docx/writer/fonts.py

@@ -10,7 +10,6 @@ from uuid import uuid4
 
 from calibre.ebooks.oeb.base import OEB_STYLES
 from calibre.ebooks.oeb.transforms.subset import find_font_face_rules
-from polyglot.builtins import range
 
 
 def obfuscate_font_data(data, key):

src/calibre/ebooks/docx/writer/images.py

@@ -9,7 +9,7 @@ import os
 import posixpath
 from collections import namedtuple
 from functools import partial
-from polyglot.builtins import iteritems, itervalues, map, unicode_type
+from polyglot.builtins import iteritems, itervalues, unicode_type
 
 from lxml import etree
 

src/calibre/ebooks/docx/writer/styles.py

@@ -14,7 +14,7 @@ from lxml import etree
 from calibre.ebooks import parse_css_length
 from calibre.ebooks.docx.writer.utils import convert_color, int_or_zero
 from calibre.utils.localization import lang_as_iso639_1
-from polyglot.builtins import iteritems, filter, unicode_type
+from polyglot.builtins import iteritems, unicode_type
 from tinycss.css21 import CSS21Parser
 
 css_parser = CSS21Parser()

src/calibre/ebooks/docx/writer/tables.py

@@ -9,7 +9,7 @@ from collections import namedtuple
 
 from calibre.ebooks.docx.writer.utils import convert_color
 from calibre.ebooks.docx.writer.styles import read_css_block_borders as rcbb, border_edges
-from polyglot.builtins import iteritems, range, unicode_type
+from polyglot.builtins import iteritems, unicode_type
 
 
 class Dummy:

src/calibre/ebooks/epub/cfi/parse.py

@@ -6,7 +6,6 @@ __license__ = 'GPL v3'
 __copyright__ = '2014, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import regex
-from polyglot.builtins import map, zip
 
 
 class Parser:

src/calibre/ebooks/epub/cfi/tests.py

@@ -6,7 +6,6 @@ __license__ = 'GPL v3'
 __copyright__ = '2014, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import unittest, numbers
-from polyglot.builtins import map
 
 from calibre.ebooks.epub.cfi.parse import parser, cfi_sort_key, decode_cfi
 from polyglot.builtins import iteritems, unicode_type

src/calibre/ebooks/epub/periodical.py

@@ -12,7 +12,7 @@ import time
 from calibre.constants import __appname__, __version__
 from calibre import strftime, prepare_string_for_xml as xml
 from calibre.utils.date import parse_date
-from polyglot.builtins import unicode_type, filter
+from polyglot.builtins import unicode_type
 
 SONY_METADATA = '''\
 <?xml version="1.0" encoding="utf-8"?>

src/calibre/ebooks/fb2/fb2ml.py

@@ -20,7 +20,7 @@ from calibre.utils.localization import lang_as_iso639_1
 from calibre.utils.xml_parse import safe_xml_fromstring
 from calibre.utils.img import save_cover_data_to
 from calibre.ebooks.oeb.base import urlnormalize
-from polyglot.builtins import unicode_type, string_or_bytes, range, filter
+from polyglot.builtins import unicode_type, string_or_bytes
 from polyglot.binary import as_base64_unicode
 from polyglot.urllib import urlparse
 

src/calibre/ebooks/lit/maps/opf.py

@@ -7,7 +7,6 @@ __copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
 Microsoft LIT OPF tag and attribute tables, copied from ConvertLIT.
 """
 
-from polyglot.builtins import range
 
 TAGS = [
     None,

src/calibre/ebooks/lit/mssha1.py

@@ -9,7 +9,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
 
 import struct, copy
-from polyglot.builtins import range, long_type
+from polyglot.builtins import long_type
 
 # ======================================================================
 # Bit-Manipulation helpers

src/calibre/ebooks/lit/reader.py

@@ -17,7 +17,7 @@ import calibre.ebooks.lit.mssha1 as mssha1
 from calibre.ebooks.oeb.base import urlnormalize, xpath
 from calibre.ebooks.oeb.reader import OEBReader
 from calibre.ebooks import DRMError
-from polyglot.builtins import codepoint_to_chr, unicode_type, string_or_bytes, range, itervalues
+from polyglot.builtins import codepoint_to_chr, unicode_type, string_or_bytes, itervalues
 from polyglot.urllib import unquote as urlunquote, urldefrag
 from calibre_extensions import lzx, msdes
 

src/calibre/ebooks/lit/writer.py

@@ -29,7 +29,7 @@ from calibre.ebooks.lit.lzx import Compressor
 import calibre
 from calibre_extensions import msdes
 import calibre.ebooks.lit.mssha1 as mssha1
-from polyglot.builtins import codepoint_to_chr, unicode_type, string_or_bytes, range, zip, native_string_type
+from polyglot.builtins import codepoint_to_chr, unicode_type, string_or_bytes, native_string_type
 from polyglot.urllib import urldefrag, unquote
 
 __all__ = ['LitWriter']

src/calibre/ebooks/lrf/html/table.py

@@ -8,7 +8,7 @@ from calibre.ebooks.lrf.fonts import get_font
 from calibre.ebooks.lrf.pylrs.pylrs import TextBlock, Text, CR, Span, \
                                              CharButton, Plot, Paragraph, \
                                              LrsTextTag
-from polyglot.builtins import string_or_bytes, range, native_string_type
+from polyglot.builtins import string_or_bytes, native_string_type
 
 
 def ceil(num):

src/calibre/ebooks/lrf/input.py

@@ -12,7 +12,7 @@ from copy import deepcopy, copy
 from lxml import etree
 
 from calibre import guess_type
-from polyglot.builtins import as_bytes, map, unicode_type
+from polyglot.builtins import as_bytes, unicode_type
 
 
 class Canvas(etree.XSLTExtension):

src/calibre/ebooks/metadata/__init__.py

@@ -14,7 +14,7 @@ from contextlib import suppress
 
 from calibre import relpath, guess_type, prints, force_unicode
 from calibre.utils.config_base import tweaks
-from polyglot.builtins import codepoint_to_chr, unicode_type, range, map, zip, getcwd, iteritems, as_unicode
+from polyglot.builtins import codepoint_to_chr, unicode_type, getcwd, iteritems, as_unicode
 from polyglot.urllib import quote, unquote, urlparse
 
 

src/calibre/ebooks/metadata/archive.py

@@ -11,7 +11,7 @@ from contextlib import closing
 
 from calibre.customize import FileTypePlugin
 from calibre.utils.localization import canonicalize_lang
-from polyglot.builtins import filter, unicode_type
+from polyglot.builtins import unicode_type
 
 
 def is_comic(list_of_names):

src/calibre/ebooks/metadata/author_mapper.py

@@ -7,7 +7,7 @@ import re
 from collections import deque
 
 from calibre.utils.icu import capitalize, lower, upper
-from polyglot.builtins import filter, unicode_type
+from polyglot.builtins import unicode_type
 
 
 def cap_author_token(token):

src/calibre/ebooks/metadata/book/base.py

@@ -15,7 +15,7 @@ from calibre.ebooks.metadata.book import (SC_COPYABLE_FIELDS,
         TOP_LEVEL_IDENTIFIERS, ALL_METADATA_FIELDS)
 from calibre.library.field_metadata import FieldMetadata
 from calibre.utils.icu import sort_key
-from polyglot.builtins import iteritems, unicode_type, filter, map, string_or_bytes
+from polyglot.builtins import iteritems, unicode_type, string_or_bytes
 
 # Special sets used to optimize the performance of getting and setting
 # attributes on Metadata objects

src/calibre/ebooks/metadata/book/render.py

@@ -19,7 +19,6 @@ from calibre.utils.formatter import EvalFormatter
 from calibre.utils.date import is_date_undefined
 from calibre.utils.localization import calibre_langcode_to_name
 from calibre.utils.serialize import json_dumps
-from polyglot.builtins import filter
 from polyglot.binary import as_hex_unicode
 
 default_sort = ('title', 'title_sort', 'authors', 'author_sort', 'series', 'rating', 'pubdate', 'tags', 'publisher', 'identifiers')

src/calibre/ebooks/metadata/kdl.py

@@ -14,7 +14,7 @@ from calibre.ebooks.metadata.book.base import Metadata
 from calibre import browser
 from calibre.ebooks.BeautifulSoup import BeautifulSoup
 from calibre.ebooks.chardet import xml_to_unicode
-from polyglot.builtins import codepoint_to_chr, unicode_type, range
+from polyglot.builtins import codepoint_to_chr, unicode_type
 from polyglot.urllib import parse_qs, quote_plus
 
 URL = \

src/calibre/ebooks/metadata/kfx.py

@@ -16,7 +16,7 @@ from calibre.utils.config_base import tweaks
 from calibre.utils.date import parse_only_date
 from calibre.utils.localization import canonicalize_lang
 from calibre.utils.imghdr import identify
-from polyglot.builtins import unicode_type, filter, map
+from polyglot.builtins import unicode_type
 from polyglot.binary import as_base64_bytes, from_base64_bytes
 
 

src/calibre/ebooks/metadata/mobi.py

@@ -15,7 +15,7 @@ from calibre.ebooks.mobi.utils import rescale_image
 from calibre.utils.date import now as nowf
 from calibre.utils.imghdr import what
 from calibre.utils.localization import canonicalize_lang, lang_as_iso639_1
-from polyglot.builtins import codepoint_to_chr, range, unicode_type
+from polyglot.builtins import codepoint_to_chr, unicode_type
 
 
 '''

src/calibre/ebooks/metadata/opf2.py

@@ -24,7 +24,7 @@ from calibre import prints, guess_type
 from calibre.utils.cleantext import clean_ascii_chars, clean_xml_chars
 from calibre.utils.config import tweaks
 from calibre.utils.xml_parse import safe_xml_fromstring
-from polyglot.builtins import iteritems, unicode_type, getcwd, map
+from polyglot.builtins import iteritems, unicode_type, getcwd
 from polyglot.urllib import unquote, urlparse
 
 pretty_print_opf = False

src/calibre/ebooks/metadata/opf3.py

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

src/calibre/ebooks/metadata/plucker.py

@@ -16,7 +16,6 @@ from calibre.ebooks.metadata import MetaInformation
 from calibre.ebooks.pdb.header import PdbHeaderReader
 from calibre.ebooks.pdb.plucker.reader import SectionHeader, DATATYPE_METADATA, \
     MIBNUM_TO_NAME
-from polyglot.builtins import range
 
 
 def get_metadata(stream, extract_cover=True):

src/calibre/ebooks/metadata/rtf.py

@@ -11,7 +11,7 @@ import re
 
 from calibre import force_unicode
 from calibre.ebooks.metadata import MetaInformation
-from polyglot.builtins import codepoint_to_chr, string_or_bytes, unicode_type, int_to_byte, filter
+from 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)

src/calibre/ebooks/metadata/tag_mapper.py

@@ -5,7 +5,7 @@
 
 from collections import deque
 
-from polyglot.builtins import filter, unicode_type
+from polyglot.builtins import unicode_type
 
 
 def compile_pat(pat):

src/calibre/ebooks/metadata/utils.py

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

src/calibre/ebooks/metadata/xmp.py

@@ -19,7 +19,7 @@ from calibre.ebooks.metadata.book.base import Metadata
 from calibre.ebooks.metadata.opf2 import dump_dict
 from calibre.utils.date import parse_date, isoformat, now
 from calibre.utils.localization import canonicalize_lang, lang_as_iso639_1
-from polyglot.builtins import iteritems, string_or_bytes, filter
+from polyglot.builtins import iteritems, string_or_bytes
 
 _xml_declaration = re.compile(r'<\?xml[^<>]+encoding\s*=\s*[\'"](.*?)[\'"][^<>]*>', re.IGNORECASE)
 

src/calibre/ebooks/mobi/debug/containers.py

@@ -8,7 +8,7 @@ __copyright__ = '2014, Kovid Goyal <kovid at kovidgoyal.net>'
 from struct import unpack_from
 
 from calibre.ebooks.mobi.debug.headers import EXTHHeader
-from polyglot.builtins import filter, unicode_type
+from polyglot.builtins import unicode_type
 
 
 class ContainerHeader:

src/calibre/ebooks/mobi/debug/headers.py

@@ -13,7 +13,7 @@ from calibre.ebooks.mobi.reader.headers import NULL_INDEX
 from calibre.ebooks.mobi.langcodes import main_language, sub_language
 from calibre.ebooks.mobi.debug import format_bytes
 from calibre.ebooks.mobi.utils import get_trailing_data
-from polyglot.builtins import iteritems, range, unicode_type
+from polyglot.builtins import iteritems, unicode_type
 
 # PalmDB {{{
 

src/calibre/ebooks/mobi/debug/index.py

@@ -14,7 +14,7 @@ from calibre.ebooks.mobi.reader.headers import NULL_INDEX
 from calibre.ebooks.mobi.reader.index import (CNCX, parse_indx_header,
         parse_tagx_section, parse_index_record, INDEX_HEADER_FIELDS)
 from calibre.ebooks.mobi.reader.ncx import (tag_fieldname_map, default_entry)
-from polyglot.builtins import iteritems, range
+from polyglot.builtins import iteritems
 
 File = namedtuple('File',
     'file_number name divtbl_count start_position length')

src/calibre/ebooks/mobi/debug/mobi6.py

@@ -19,7 +19,7 @@ from calibre.ebooks.mobi.utils import (decode_hex_number, decint,
 from calibre.utils.imghdr import what
 from calibre.ebooks.mobi.debug import format_bytes
 from calibre.ebooks.mobi.debug.headers import TextRecord
-from polyglot.builtins import unicode_type, range, iteritems, as_bytes, print_to_binary_file
+from polyglot.builtins import unicode_type, iteritems, as_bytes, print_to_binary_file
 
 
 class TagX:  # {{{

src/calibre/ebooks/mobi/debug/mobi8.py

@@ -17,7 +17,7 @@ from calibre.ebooks.mobi.utils import read_font_record, decode_tbs, RECORD_SIZE
 from calibre.ebooks.mobi.debug import format_bytes
 from calibre.ebooks.mobi.reader.headers import NULL_INDEX
 from calibre.utils.imghdr import what
-from polyglot.builtins import iteritems, itervalues, map, unicode_type, zip, print_to_binary_file
+from polyglot.builtins import iteritems, itervalues, unicode_type, print_to_binary_file
 
 
 class FDST:

src/calibre/ebooks/mobi/huffcdic.py

@@ -14,7 +14,6 @@ and igorsk.
 import struct
 
 from calibre.ebooks.mobi import MobiError
-from polyglot.builtins import map
 
 
 class Reader:

src/calibre/ebooks/mobi/reader/index.py

@@ -11,7 +11,7 @@ from collections import OrderedDict, namedtuple
 
 from calibre.ebooks.mobi.utils import (decint, count_set_bits,
         decode_string)
-from polyglot.builtins import iteritems, range, zip
+from polyglot.builtins import iteritems
 
 TagX = namedtuple('TagX', 'tag num_of_values bitmask eof')
 PTagX = namedtuple('PTagX', 'tag value_count value_bytes num_of_values')

src/calibre/ebooks/mobi/reader/mobi6.py

@@ -28,7 +28,7 @@ from calibre.utils.cleantext import clean_ascii_chars, clean_xml_chars
 from calibre.utils.img import AnimatedGIF, gif_data_to_png_data, save_cover_data_to
 from calibre.utils.imghdr import what
 from calibre.utils.logging import default_log
-from polyglot.builtins import iteritems, map, range, unicode_type
+from polyglot.builtins import iteritems, unicode_type
 
 
 class TopazError(ValueError):

src/calibre/ebooks/mobi/reader/mobi8.py

@@ -23,7 +23,7 @@ from calibre.ebooks.metadata.toc import TOC
 from calibre.ebooks.mobi.utils import read_font_record
 from calibre.ebooks.oeb.parse_utils import parse_html
 from calibre.ebooks.oeb.base import XPath, XHTML, xml2text
-from polyglot.builtins import range, zip, unicode_type, getcwd, as_unicode
+from polyglot.builtins import unicode_type, getcwd, as_unicode
 from polyglot.urllib import urldefrag
 
 Part = namedtuple('Part',

src/calibre/ebooks/mobi/utils.py

@@ -13,7 +13,7 @@ from io import BytesIO
 from calibre.utils.img import save_cover_data_to, scale_image, image_to_data, image_from_data, resize_image, png_data_to_gif_data
 from calibre.utils.imghdr import what
 from calibre.ebooks import normalize
-from polyglot.builtins import unicode_type, range, as_bytes, map
+from polyglot.builtins import unicode_type, as_bytes
 from tinycss.color3 import parse_color_string
 
 IMAGE_MAX_SIZE = 10 * 1024 * 1024

src/calibre/ebooks/mobi/writer2/indexer.py

@@ -13,7 +13,7 @@ from collections import OrderedDict, defaultdict
 
 from calibre.ebooks.mobi.utils import (encint, encode_number_as_hex,
         encode_tbs, align_block, RECORD_SIZE, CNCX as CNCX_)
-from polyglot.builtins import filter, iteritems, itervalues, map, range
+from polyglot.builtins import iteritems, itervalues
 
 
 class CNCX(CNCX_):  # {{{

src/calibre/ebooks/mobi/writer2/main.py

@@ -18,7 +18,7 @@ from calibre.ebooks.mobi.writer2 import (PALMDOC, UNCOMPRESSED)
 from calibre.ebooks.mobi.utils import (encint, encode_trailing_data,
         align_block, detect_periodical, RECORD_SIZE, create_text_record)
 from calibre.ebooks.mobi.writer2.indexer import Indexer
-from polyglot.builtins import iteritems, unicode_type, range
+from polyglot.builtins import iteritems, unicode_type
 
 # Disabled as I dont care about uncrossable breaks
 WRITE_UNCROSSABLE_BREAKS = False

src/calibre/ebooks/mobi/writer8/index.py

@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
 
-from polyglot.builtins import map
-
 __license__   = 'GPL v3'
 __copyright__ = '2012, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
@@ -10,7 +8,7 @@ __docformat__ = 'restructuredtext en'
 from collections import namedtuple
 from struct import pack
 from io import BytesIO
-from polyglot.builtins import unicode_type, zip, range
+from polyglot.builtins import unicode_type
 
 from calibre.ebooks.mobi.utils import CNCX, encint, align_block
 from calibre.ebooks.mobi.writer8.header import Header

src/calibre/ebooks/odt/input.py

@@ -20,7 +20,7 @@ from odf.namespaces import TEXTNS as odTEXTNS
 from calibre import CurrentDir, walk
 from calibre.ebooks.oeb.base import _css_logger
 from calibre.utils.xml_parse import safe_xml_fromstring
-from polyglot.builtins import unicode_type, string_or_bytes, filter, getcwd, as_bytes
+from polyglot.builtins import unicode_type, string_or_bytes, getcwd, as_bytes
 
 
 class Extract(ODF2XHTML):

src/calibre/ebooks/oeb/base.py

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

src/calibre/ebooks/oeb/iterator/spine.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
 
-from polyglot.builtins import map, unicode_type
+from polyglot.builtins import unicode_type
 
 __license__   = 'GPL v3'
 __copyright__ = '2012, Kovid Goyal <kovid@kovidgoyal.net>'

src/calibre/ebooks/oeb/normalize_css.py

@@ -12,7 +12,7 @@ from css_parser.css import PropertyValue
 from css_parser import profile as cssprofiles, CSSParser
 from tinycss.fonts3 import parse_font, serialize_font_family
 from calibre.ebooks.oeb.base import css_text
-from polyglot.builtins import iteritems, string_or_bytes, unicode_type, zip
+from polyglot.builtins import iteritems, string_or_bytes, unicode_type
 
 DEFAULTS = {'azimuth': 'center', 'background-attachment': 'scroll',  # {{{
             'background-color': 'transparent', 'background-image': 'none',