Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 18:24:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kovid Goyal 2019-02-21 09:48:37 +05:30
commit 1a16a0e545
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
5 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/__init__.py
View File

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

4
src/calibre/gui2/wizard/__init__.py
View File

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

16
src/calibre/startup.py
View File

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

7
src/calibre/utils/resources.py
View File

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

9
src/polyglot/builtins.py
View File

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