Merge branch 'py3' of https://github.com/eli-schwartz/calibre

src/calibre/__init__.py

@@ -3,8 +3,9 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import sys, os, re, time, random, __builtin__, warnings
-__builtin__.__dict__['dynamic_property'] = lambda func: func(None)
+import sys, os, re, time, random, warnings
+from polyglot.builtins import builtins
+builtins.__dict__['dynamic_property'] = lambda func: func(None)
 from math import floor
 from functools import partial
 

src/calibre/gui2/wizard/__init__.py

@@ -689,8 +689,8 @@ class LibraryPage(QWizardPage, LibraryUI):
 
     def change_language(self, idx):
         prefs['language'] = str(self.language.itemData(self.language.currentIndex()) or '')
-        import __builtin__
-        __builtin__.__dict__['_'] = lambda x: x
+        from polyglot.builtins import builtins
+        builtins.__dict__['_'] = lambda x: x
         from calibre.utils.localization import set_translators
         from calibre.gui2 import qt_app
         from calibre.ebooks.metadata.book.base import reset_field_metadata

src/calibre/startup.py

@@ -10,12 +10,12 @@ Perform various initialization tasks.
 import locale, sys
 
 # Default translation is NOOP
-import __builtin__
-__builtin__.__dict__['_'] = lambda s: s
+from polyglot.builtins import builtins
+builtins.__dict__['_'] = lambda s: s
 
 # For strings which belong in the translation tables, but which shouldn't be
 # immediately translated to the environment language
-__builtin__.__dict__['__'] = lambda s: s
+builtins.__dict__['__'] = lambda s: s
 
 from calibre.constants import iswindows, preferred_encoding, plugins, isosx, islinux, isfrozen, DEBUG, isfreebsd
 
@@ -161,12 +161,12 @@ if not _run_once:
                 supports_mode_e = True
             return ans
 
-    __builtin__.__dict__['lopen'] = local_open
+    builtins.__dict__['lopen'] = local_open
 
     from calibre.utils.icu import title_case, lower as icu_lower, upper as icu_upper
-    __builtin__.__dict__['icu_lower'] = icu_lower
-    __builtin__.__dict__['icu_upper'] = icu_upper
-    __builtin__.__dict__['icu_title'] = title_case
+    builtins.__dict__['icu_lower'] = icu_lower
+    builtins.__dict__['icu_upper'] = icu_upper
+    builtins.__dict__['icu_title'] = title_case
 
     def connect_lambda(bound_signal, self, func, **kw):
         import weakref
@@ -184,7 +184,7 @@ if not _run_once:
                 func(ctx, *args)
 
         bound_signal.connect(slot, **kw)
-    __builtin__.__dict__['connect_lambda'] = connect_lambda
+    builtins.__dict__['connect_lambda'] = connect_lambda
 
     if islinux or isosx or isfreebsd:
         # Name all threads at the OS level created using the threading module, see

src/calibre/utils/resources.py

@@ -8,9 +8,10 @@ __copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
 
-import __builtin__, sys, os
+import sys, os
 
 from calibre import config_dir
+from polyglot.builtins import builtins
 
 
 class PathResolver(object):
@@ -150,5 +151,5 @@ def load_hyphenator_dicts(hp_cache, lang, default_lang='en'):
     return js, lang
 
 
-__builtin__.__dict__['P'] = get_path
-__builtin__.__dict__['I'] = get_image_path
+builtins.__dict__['P'] = get_path
+builtins.__dict__['I'] = get_image_path

src/polyglot/builtins.py

@@ -20,9 +20,11 @@ if is_py3:
             value = None
             tb = None
 
-    zip = __builtins__['zip']
-    map = __builtins__['map']
-    filter = __builtins__['filter']
+    import builtins
+
+    zip = builtins.__dict__['zip']
+    map = builtins.__dict__['map']
+    filter = builtins.__dict__['filter']
 
     def iteritems(d):
         return iter(d.items())
@@ -42,6 +44,7 @@ else:
 """)
 
     from future_builtins import zip, map, filter  # noqa
+    import __builtin__ as builtins
 
     def iteritems(d):
         return d.iteritems()