Port future_builtins to polyglot

setup/multitail.py

@@ -8,7 +8,7 @@ __copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import curses, os, select, fcntl, errno, re
 from io import BlockingIOError
-from future_builtins import map
+from polyglot.builtins import map
 from threading import Thread
 
 clean_pat = re.compile(b'[\n\r\f\v]')

setup/plugins_mirror.py

@@ -31,7 +31,7 @@ from contextlib import closing
 from datetime import datetime
 from email.utils import parsedate
 from functools import partial
-from future_builtins import filter, map, zip
+from polyglot.builtins import filter, map, zip
 from multiprocessing.pool import ThreadPool
 from xml.sax.saxutils import escape, quoteattr
 # }}}

src/calibre/constants.py

@@ -2,7 +2,7 @@
 # vim:fileencoding=utf-8
 # License: GPLv3 Copyright: 2015, Kovid Goyal <kovid at kovidgoyal.net>
 from __future__ import print_function
-from future_builtins import map
+from polyglot.builtins import map
 import sys, locale, codecs, os, importlib, collections
 
 __appname__   = u'calibre'

src/calibre/customize/zipplugin.py

@@ -2,7 +2,7 @@
 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
 from __future__ import (unicode_literals, division, absolute_import,
                         print_function)
-from future_builtins import map
+from polyglot.builtins import map
 
 __license__   = 'GPL v3'
 __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'

src/calibre/db/adding.py

@@ -8,7 +8,7 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import os, time, re
 from collections import defaultdict
-from future_builtins import map
+from polyglot.builtins import map
 from contextlib import contextmanager
 from functools import partial
 

src/calibre/db/cache.py

@@ -11,7 +11,7 @@ import os, traceback, random, shutil, operator
 from io import BytesIO
 from collections import defaultdict, Set, MutableSet
 from functools import wraps, partial
-from future_builtins import zip
+from polyglot.builtins import zip
 from time import time
 
 from calibre import isbytestring, as_unicode

src/calibre/db/categories.py

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

src/calibre/db/fields.py

@@ -2,7 +2,7 @@
 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
 from __future__ import (unicode_literals, division, absolute_import,
                         print_function)
-# from future_builtins import map
+# from polyglot.builtins import map
 
 __license__   = 'GPL v3'
 __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'

src/calibre/db/legacy.py

@@ -7,7 +7,7 @@ __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import os, traceback, types
-from future_builtins import zip
+from polyglot.builtins import zip
 
 from calibre import force_unicode, isbytestring
 from calibre.constants import preferred_encoding

src/calibre/db/tests/base.py

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

src/calibre/db/utils.py

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

src/calibre/db/view.py

@@ -10,7 +10,7 @@ __docformat__ = 'restructuredtext en'
 import weakref, operator
 from functools import partial
 from itertools import izip, imap
-from future_builtins import map
+from polyglot.builtins import map
 
 from calibre.ebooks.metadata import title_sort
 from calibre.utils.config_base import tweaks, prefs

src/calibre/db/write.py

@@ -10,7 +10,7 @@ __docformat__ = 'restructuredtext en'
 import re
 from functools import partial
 from datetime import datetime
-from future_builtins import zip
+from polyglot.builtins import zip
 
 from calibre.constants import preferred_encoding, ispy3
 from calibre.ebooks.metadata import author_to_author_sort, title_sort

src/calibre/devices/mtp/filesystem_cache.py

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

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

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

src/calibre/devices/winusb.py

@@ -15,7 +15,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 future_builtins import map
+from polyglot.builtins import map
 
 from calibre import prints, as_unicode
 

src/calibre/ebooks/covers.py

@@ -10,7 +10,7 @@ import re, random, unicodedata
 from collections import namedtuple
 from contextlib import contextmanager
 from math import ceil, sqrt, cos, sin, atan2
-from future_builtins import map, zip
+from polyglot.builtins import map, zip
 from itertools import chain
 
 from PyQt5.Qt import (

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

@@ -10,7 +10,7 @@ import os
 import posixpath
 from collections import namedtuple
 from functools import partial
-from future_builtins import map
+from polyglot.builtins import map
 
 from lxml import etree
 

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

@@ -7,7 +7,7 @@ __license__ = 'GPL v3'
 __copyright__ = '2014, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import regex, sys
-from future_builtins import map, zip
+from polyglot.builtins import map, zip
 
 is_narrow_build = sys.maxunicode < 0x10ffff
 

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

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

src/calibre/ebooks/metadata/author_mapper.py

@@ -6,7 +6,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 
 import re
 from collections import deque
-from future_builtins import map
+from polyglot.builtins import map
 
 from calibre.utils.icu import capitalize, lower, upper
 

src/calibre/ebooks/metadata/opf3.py

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

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

@@ -8,7 +8,7 @@ __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
 import re, threading
-from future_builtins import map
+from polyglot.builtins import map
 
 from calibre import browser, random_user_agent
 from calibre.customize import Plugin

src/calibre/ebooks/metadata/sources/search_engines.py

@@ -8,7 +8,7 @@ import json
 import re
 import time
 from collections import defaultdict, namedtuple
-from future_builtins import map
+from polyglot.builtins import map
 from urllib import quote_plus, urlencode
 from urlparse import parse_qs
 

src/calibre/ebooks/metadata/utils.py

@@ -5,7 +5,7 @@
 from __future__ import (unicode_literals, division, absolute_import,
                         print_function)
 from collections import namedtuple
-from future_builtins import map
+from polyglot.builtins import map
 
 from lxml import etree
 

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

@@ -2,7 +2,7 @@
 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
 from __future__ import (unicode_literals, division, absolute_import,
                         print_function)
-from future_builtins import map
+from polyglot.builtins import map
 
 __license__   = 'GPL v3'
 __copyright__ = '2012, Kovid Goyal <kovid@kovidgoyal.net>'

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

@@ -2,7 +2,7 @@
 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
 from __future__ import (unicode_literals, division, absolute_import,
                         print_function)
-from future_builtins import filter, map
+from polyglot.builtins import filter, map
 
 __license__   = 'GPL v3'
 __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'

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

@@ -2,7 +2,7 @@
 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
 from __future__ import (unicode_literals, division, absolute_import,
                         print_function)
-from future_builtins import map
+from polyglot.builtins import map
 
 __license__   = 'GPL v3'
 __copyright__ = '2012, Kovid Goyal <kovid@kovidgoyal.net>'
@@ -11,7 +11,7 @@ __docformat__ = 'restructuredtext en'
 from collections import namedtuple
 from struct import pack
 from io import BytesIO
-from future_builtins import zip
+from polyglot.builtins import zip
 
 from calibre.ebooks.mobi.utils import CNCX, encint, align_block
 from calibre.ebooks.mobi.writer8.header import Header

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

@@ -2,7 +2,7 @@
 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
 from __future__ import (unicode_literals, division, absolute_import,
                         print_function)
-from future_builtins import map
+from polyglot.builtins import map
 
 __license__   = 'GPL v3'
 __copyright__ = '2012, Kovid Goyal <kovid@kovidgoyal.net>'

src/calibre/ebooks/oeb/normalize_css.py

@@ -6,7 +6,7 @@ from __future__ import (unicode_literals, division, absolute_import,
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
-from future_builtins import zip
+from polyglot.builtins import zip
 from functools import wraps
 
 try:

src/calibre/ebooks/oeb/polish/check/links.py

@@ -9,7 +9,7 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 import os
 from collections import defaultdict
 from urlparse import urlparse
-from future_builtins import map
+from polyglot.builtins import map
 from threading import Thread
 from Queue import Queue, Empty
 

src/calibre/ebooks/oeb/polish/check/main.py

@@ -6,7 +6,7 @@ from __future__ import (unicode_literals, division, absolute_import,
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
-from future_builtins import map
+from polyglot.builtins import map
 
 from calibre.ebooks.oeb.base import OEB_DOCS, OEB_STYLES
 from calibre.ebooks.oeb.polish.utils import guess_type

src/calibre/ebooks/oeb/polish/container.py

@@ -14,7 +14,7 @@ import time
 import unicodedata
 import uuid
 from collections import defaultdict
-from future_builtins import zip
+from polyglot.builtins import zip
 from io import BytesIO
 from itertools import count
 from urlparse import urlparse

src/calibre/ebooks/oeb/polish/embed.py

@@ -8,7 +8,7 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
 import sys
-from future_builtins import map
+from polyglot.builtins import map
 
 from lxml import etree
 

src/calibre/ebooks/oeb/polish/pretty.py

@@ -7,7 +7,7 @@ __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import textwrap
-from future_builtins import map
+from polyglot.builtins import map
 
 # from lxml.etree import Element
 

src/calibre/ebooks/oeb/polish/replace.py

@@ -8,7 +8,7 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
 import codecs, shutil, os, posixpath
-from future_builtins import map
+from polyglot.builtins import map
 from functools import partial
 from urlparse import urlparse, urlunparse
 from collections import Counter, defaultdict

src/calibre/ebooks/oeb/polish/split.py

@@ -7,7 +7,7 @@ __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import copy, os, re
-from future_builtins import map
+from polyglot.builtins import map
 from urlparse import urlparse
 
 from calibre.ebooks.oeb.base import barename, XPNSMAP, XPath, OPF, XHTML, OEB_DOCS

src/calibre/ebooks/oeb/polish/toc.py

@@ -11,7 +11,7 @@ import re
 from urlparse import urlparse
 from collections import Counter, OrderedDict
 from functools import partial
-from future_builtins import map
+from polyglot.builtins import map
 from operator import itemgetter
 
 from lxml import etree

src/calibre/ebooks/pdf/render/engine.py

@@ -10,7 +10,7 @@ __docformat__ = 'restructuredtext en'
 import sys, traceback, math
 from collections import namedtuple
 from functools import wraps, partial
-from future_builtins import map, zip
+from polyglot.builtins import map, zip
 
 from PyQt5.Qt import (QPaintEngine, QPaintDevice, Qt, QTransform, QBrush)
 

src/calibre/ebooks/pdf/render/fonts.py

@@ -11,7 +11,7 @@ import re
 from itertools import izip, groupby
 from operator import itemgetter
 from collections import Counter, OrderedDict
-from future_builtins import map
+from polyglot.builtins import map
 
 from calibre import as_unicode
 from calibre.ebooks.pdf.render.common import (Array, String, Stream,

src/calibre/ebooks/pdf/render/from_html.py

@@ -8,7 +8,7 @@ __copyright__ = '2012, Kovid Goyal <kovid at kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
 import json, os
-from future_builtins import map
+from polyglot.builtins import map
 from math import floor
 from collections import defaultdict
 

src/calibre/ebooks/pdf/render/gradients.py

@@ -8,7 +8,7 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
 import sys, copy
-from future_builtins import map
+from polyglot.builtins import map
 from collections import namedtuple
 
 from PyQt5.Qt import QLinearGradient, QPointF

src/calibre/ebooks/pdf/render/serialize.py

@@ -8,7 +8,7 @@ __copyright__ = '2012, Kovid Goyal <kovid at kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
 import hashlib
-from future_builtins import map
+from polyglot.builtins import map
 
 from PyQt5.Qt import QBuffer, QByteArray, QImage, Qt, QColor, qRgba, QPainter
 

src/calibre/gui2/actions/author_mapper.py

@@ -4,7 +4,7 @@
 
 from __future__ import (unicode_literals, division, absolute_import,
                         print_function)
-from future_builtins import map
+from polyglot.builtins import map
 
 from calibre.gui2 import gprefs
 from calibre.gui2.actions import InterfaceAction

src/calibre/gui2/actions/polish.py

@@ -10,7 +10,7 @@ __docformat__ = 'restructuredtext en'
 import os, weakref, shutil, textwrap
 from collections import OrderedDict
 from functools import partial
-from future_builtins import map
+from polyglot.builtins import map
 
 from PyQt5.Qt import (QDialog, QGridLayout, QIcon, QCheckBox, QLabel, QFrame,
                       QApplication, QDialogButtonBox, Qt, QSize, QSpacerItem,

src/calibre/gui2/actions/save_to_disk.py

@@ -7,7 +7,7 @@ __docformat__ = 'restructuredtext en'
 
 import os
 from functools import partial
-from future_builtins import map
+from polyglot.builtins import map
 
 
 from calibre.utils.config import prefs

src/calibre/gui2/actions/tag_mapper.py

@@ -4,7 +4,7 @@
 
 from __future__ import (unicode_literals, division, absolute_import,
                         print_function)
-from future_builtins import map
+from polyglot.builtins import map
 
 from calibre.gui2 import gprefs
 from calibre.gui2.actions import InterfaceAction

src/calibre/gui2/add.py

@@ -11,7 +11,7 @@ from threading import Thread
 from collections import OrderedDict
 from Queue import Empty
 from io import BytesIO
-from future_builtins import map
+from polyglot.builtins import map
 
 from PyQt5.Qt import QObject, Qt, pyqtSignal
 

src/calibre/gui2/add_filters.py

@@ -6,7 +6,7 @@ from __future__ import (unicode_literals, division, absolute_import,
                         print_function)
 
 from collections import OrderedDict
-from future_builtins import map
+from polyglot.builtins import map
 
 from calibre.db.adding import compile_glob, filter_filename, compile_rule
 from calibre.gui2 import elided_text, Application, error_dialog

src/calibre/gui2/auto_add.py

@@ -9,7 +9,7 @@ __docformat__ = 'restructuredtext en'
 
 import os, tempfile, shutil, time
 from threading import Thread, Event
-from future_builtins import map
+from polyglot.builtins import map
 
 from PyQt5.Qt import (QFileSystemWatcher, QObject, Qt, pyqtSignal, QTimer, QApplication, QCursor)
 

src/calibre/gui2/icon_theme.py

@@ -9,7 +9,7 @@ __copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
 import os, errno, json, importlib, math, httplib, bz2, shutil, sys
 from itertools import count
 from io import BytesIO
-from future_builtins import map
+from polyglot.builtins import map
 from Queue import Queue, Empty
 from threading import Thread, Event
 from multiprocessing.pool import ThreadPool

src/calibre/gui2/library/views.py

@@ -8,7 +8,7 @@ __docformat__ = 'restructuredtext en'
 
 import itertools, operator
 from functools import partial
-from future_builtins import map
+from polyglot.builtins import map
 from collections import OrderedDict
 
 from PyQt5.Qt import (

src/calibre/gui2/metadata/diff.py

@@ -9,7 +9,7 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 import os, weakref
 from collections import OrderedDict, namedtuple
 from functools import partial
-from future_builtins import zip
+from polyglot.builtins import zip
 
 from PyQt5.Qt import (
     QDialog, QWidget, QGridLayout, QLabel, QToolButton, QIcon,

src/calibre/gui2/tag_browser/model.py

@@ -2,7 +2,7 @@
 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
 from __future__ import (unicode_literals, division, absolute_import,
                         print_function)
-from future_builtins import map
+from polyglot.builtins import map
 
 __license__   = 'GPL v3'
 __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'

src/calibre/gui2/toc/main.py

@@ -10,7 +10,7 @@ __docformat__ = 'restructuredtext en'
 import sys, os, textwrap
 from threading import Thread
 from functools import partial
-from future_builtins import map
+from polyglot.builtins import map
 
 from PyQt5.Qt import (QPushButton, QFrame, QMenu, QInputDialog, QCheckBox,
     QDialog, QVBoxLayout, QDialogButtonBox, QSize, QStackedWidget, QWidget,

src/calibre/gui2/tweak_book/__init__.py

@@ -7,7 +7,7 @@ __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import string
-from future_builtins import map
+from polyglot.builtins import map
 
 from calibre.utils.config import JSONConfig
 from calibre.spell.dictionary import Dictionaries, parse_lang_code

src/calibre/gui2/tweak_book/diff/view.py

@@ -12,7 +12,7 @@ from math import ceil
 from functools import partial
 from collections import namedtuple, OrderedDict
 from difflib import SequenceMatcher
-from future_builtins import zip
+from polyglot.builtins import zip
 
 import regex
 from PyQt5.Qt import (

src/calibre/gui2/tweak_book/editor/text.py

@@ -8,7 +8,7 @@ import os
 import re
 import textwrap
 import unicodedata
-from future_builtins import map
+from polyglot.builtins import map
 
 from PyQt5.Qt import (
     QColor, QColorDialog, QFont, QFontDatabase, QKeySequence, QPainter, QPalette,

src/calibre/gui2/tweak_book/preferences.py

@@ -8,7 +8,7 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
 from operator import attrgetter, methodcaller
 from collections import namedtuple
-from future_builtins import map
+from polyglot.builtins import map
 from itertools import product
 from copy import copy, deepcopy
 

src/calibre/gui2/tweak_book/preview.py

@@ -9,7 +9,7 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 import time, textwrap, json
 from bisect import bisect_right
 from base64 import b64encode
-from future_builtins import map
+from polyglot.builtins import map
 from threading import Thread
 from Queue import Queue, Empty
 from functools import partial

src/calibre/gui2/tweak_book/reports.py

@@ -8,7 +8,7 @@ __copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import time, textwrap, os
 from threading import Thread
-from future_builtins import map
+from polyglot.builtins import map
 from operator import itemgetter
 from functools import partial
 from collections import defaultdict

src/calibre/gui2/tweak_book/ui.py

@@ -9,7 +9,7 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 import os
 from functools import partial
 from itertools import product
-from future_builtins import map
+from polyglot.builtins import map
 
 from PyQt5.Qt import (
     QDockWidget, Qt, QLabel, QIcon, QAction, QApplication, QWidget, QEvent,

src/calibre/gui2/update.py

@@ -2,7 +2,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import re, binascii, cPickle, ssl, json
-from future_builtins import map
+from polyglot.builtins import map
 from threading import Thread, Event
 
 from PyQt5.Qt import (QObject, pyqtSignal, Qt, QUrl, QDialog, QGridLayout,

src/calibre/gui2/viewer/documentview.py

@@ -7,7 +7,7 @@ __docformat__ = 'restructuredtext en'
 import math, json
 from base64 import b64encode
 from functools import partial
-from future_builtins import map
+from polyglot.builtins import map
 
 from PyQt5.Qt import (
     QSize, QSizePolicy, QUrl, Qt, QPainter, QPalette, QBrush,

src/calibre/library/coloring.py

@@ -2,7 +2,7 @@
 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
 from __future__ import (unicode_literals, division, absolute_import,
                         print_function)
-from future_builtins import map
+from polyglot.builtins import map
 
 __license__   = 'GPL v3'
 __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'

src/calibre/ptempfile.py

@@ -6,7 +6,7 @@ Provides platform independent temporary files that persist even after
 being closed.
 """
 import tempfile, os, atexit
-from future_builtins import map
+from polyglot.builtins import map
 
 from calibre.constants import (__version__, __appname__, filesystem_encoding,
         get_unicode_windows_env_var, iswindows, get_windows_temp_path, isosx)

src/calibre/srv/ajax.py

@@ -7,7 +7,7 @@ __license__ = 'GPL v3'
 __copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
 
 from functools import partial
-from future_builtins import zip
+from polyglot.builtins import zip
 from itertools import cycle
 
 from calibre import force_unicode

src/calibre/srv/changes.py

@@ -3,7 +3,7 @@
 # License: GPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>
 
 from __future__ import absolute_import, division, print_function, unicode_literals
-from future_builtins import map
+from polyglot.builtins import map
 
 
 class ChangeEvent(object):

src/calibre/srv/content.py

@@ -10,7 +10,7 @@ import os, errno
 from binascii import hexlify
 from io import BytesIO
 from threading import Lock
-from future_builtins import map
+from polyglot.builtins import map
 from functools import partial
 from urllib import quote
 

src/calibre/srv/http_response.py

@@ -12,7 +12,7 @@ from io import BytesIO, DEFAULT_BUFFER_SIZE
 from itertools import chain, repeat, izip_longest
 from operator import itemgetter
 from functools import wraps
-from future_builtins import map
+from polyglot.builtins import map
 
 from polyglot.builtins import reraise
 

src/calibre/srv/render_book.py

@@ -9,7 +9,7 @@ from base64 import standard_b64encode, standard_b64decode
 from collections import defaultdict, OrderedDict
 from itertools import count
 from functools import partial
-from future_builtins import map
+from polyglot.builtins import map
 from urlparse import urlparse
 from urllib import quote
 

src/calibre/srv/utils.py

@@ -13,7 +13,7 @@ from urlparse import parse_qs
 import repr as reprlib
 from email.utils import formatdate
 from operator import itemgetter
-from future_builtins import map
+from polyglot.builtins import map
 from urllib import quote as urlquote
 from binascii import hexlify, unhexlify
 

src/calibre/test_build.py

@@ -2,7 +2,7 @@
 # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
 from __future__ import (unicode_literals, division, absolute_import,
                         print_function)
-from future_builtins import map
+from polyglot.builtins import map
 
 __license__   = 'GPL v3'
 __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'

src/calibre/utils/cleantext.py

@@ -3,7 +3,7 @@ __copyright__ = '2010, sengian <sengian1@gmail.com>'
 __docformat__ = 'restructuredtext en'
 
 import re, htmlentitydefs
-from future_builtins import map
+from polyglot.builtins import map
 from calibre.constants import plugins, preferred_encoding
 
 try:

src/calibre/utils/fonts/free_type.py

@@ -9,7 +9,7 @@ __docformat__ = 'restructuredtext en'
 
 import threading
 from functools import wraps
-from future_builtins import map
+from polyglot.builtins import map
 
 from calibre.constants import plugins
 

src/calibre/utils/fonts/sfnt/metrics.py

@@ -7,7 +7,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2012, Kovid Goyal <kovid at kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-from future_builtins import map
+from polyglot.builtins import map
 from calibre.utils.fonts.utils import get_all_font_names
 from calibre.utils.fonts.sfnt.container import UnsupportedFont
 

src/calibre/utils/matcher.py

@@ -15,7 +15,7 @@ from collections import OrderedDict
 from itertools import islice
 
 from itertools import izip
-from future_builtins import map
+from polyglot.builtins import map
 
 from calibre import detect_ncpus as cpu_count, as_unicode
 from calibre.constants import plugins, filesystem_encoding

src/calibre/utils/open_with/windows.py

@@ -8,7 +8,7 @@ __copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import re, struct, ctypes
 from collections import namedtuple
-from future_builtins import map
+from polyglot.builtins import map
 
 from PyQt5.Qt import QtWin, Qt, QIcon, QByteArray, QBuffer, QPixmap
 import win32con, win32api, win32gui, pywintypes, winerror

src/polyglot/builtins.py

@@ -19,6 +19,10 @@ if is_py3:
         finally:
             value = None
             tb = None
+
+    zip = __builtins__['zip']
+    map = __builtins__['map']
+    filter = __builtins__['filter']
 else:
     exec("""def reraise(tp, value, tb=None):
     try:
@@ -26,3 +30,5 @@ else:
     finally:
         tb = None
 """)
+
+    from future_builtins import zip, map, filter  # noqa

src/tinycss/fonts3.py

@@ -8,7 +8,7 @@ __copyright__ = '2014, Kovid Goyal <kovid at kovidgoyal.net>'
 
 
 import re
-from future_builtins import map
+from polyglot.builtins import map
 from tinycss.css21 import CSS21Parser, ParseError
 from .tokenizer import tokenize_grouped