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

py3: Port constants.py to use unicode literals

Browse Source
This commit is contained in:
Kovid Goyal 2019-05-15 15:49:22 +05:30
parent 0cf114ada1
commit a78ede4c35
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 51 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/calibre/constants.py
View File

@ -1,15 +1,15 @@
#!/usr/bin/env python2 #!/usr/bin/env python2
# vim:fileencoding=utf-8 # vim:fileencoding=utf-8
# License: GPLv3 Copyright: 2015, Kovid Goyal <kovid at kovidgoyal.net> # License: GPLv3 Copyright: 2015, Kovid Goyal <kovid at kovidgoyal.net>
from __future__ import print_function from __future__ import print_function, unicode_literals
from polyglot.builtins import map, unicode_type from polyglot.builtins import map, unicode_type, hasenv, getenv, environ_item
import sys, locale, codecs, os, importlib, collections import sys, locale, codecs, os, importlib, collections
__appname__ = u'calibre' __appname__ = 'calibre'
numeric_version = (3, 42, 0) numeric_version = (3, 42, 0)
__version__ = u'.'.join(map(unicode_type, numeric_version)) __version__ = '.'.join(map(unicode_type, numeric_version))
git_version = None git_version = None
__author__ = u"Kovid Goyal <kovid@kovidgoyal.net>" __author__ = "Kovid Goyal <kovid@kovidgoyal.net>"
''' '''
Various run time constants. Various run time constants.
@ -28,7 +28,7 @@ ishaiku = 'haiku1' in _plat
islinux = not(iswindows or isosx or isbsd or ishaiku) islinux = not(iswindows or isosx or isbsd or ishaiku)
isfrozen = hasattr(sys, 'frozen') isfrozen = hasattr(sys, 'frozen')
isunix = isosx or islinux or ishaiku isunix = isosx or islinux or ishaiku
isportable = os.environ.get('CALIBRE_PORTABLE_BUILD', None) is not None isportable = hasenv('CALIBRE_PORTABLE_BUILD')
ispy3 = sys.version_info.major > 2 ispy3 = sys.version_info.major > 2
isxp = isoldvista = False isxp = isoldvista = False
if iswindows: if iswindows:
@ -36,13 +36,13 @@ if iswindows:
isxp = wver.major < 6 isxp = wver.major < 6
isoldvista = wver.build < 6002 isoldvista = wver.build < 6002
is64bit = sys.maxsize > (1 << 32) is64bit = sys.maxsize > (1 << 32)
isworker = 'CALIBRE_WORKER' in os.environ or 'CALIBRE_SIMPLE_WORKER' in os.environ isworker = hasenv('CALIBRE_WORKER') or hasenv('CALIBRE_SIMPLE_WORKER')
if isworker: if isworker:
os.environ.pop('CALIBRE_FORCE_ANSI', None) os.environ.pop(environ_item('CALIBRE_FORCE_ANSI'), None)
FAKE_PROTOCOL, FAKE_HOST = 'https', 'calibre-internal.invalid' FAKE_PROTOCOL, FAKE_HOST = 'https', 'calibre-internal.invalid'
VIEWER_APP_UID = u'com.calibre-ebook.viewer' VIEWER_APP_UID = 'com.calibre-ebook.viewer'
EDITOR_APP_UID = u'com.calibre-ebook.edit-book' EDITOR_APP_UID = 'com.calibre-ebook.edit-book'
MAIN_APP_UID = u'com.calibre-ebook.main-gui' MAIN_APP_UID = 'com.calibre-ebook.main-gui'
try: try:
preferred_encoding = locale.getpreferredencoding() preferred_encoding = locale.getpreferredencoding()
codecs.lookup(preferred_encoding) codecs.lookup(preferred_encoding)
@ -84,11 +84,11 @@ else:
# bytestring if sys.getfilesystemencoding() == 'ascii', which is # bytestring if sys.getfilesystemencoding() == 'ascii', which is
# just plain dumb. This is fixed by the icu.py module which, when # just plain dumb. This is fixed by the icu.py module which, when
# imported changes ascii to utf-8 # imported changes ascii to utf-8
except: except Exception:
filesystem_encoding = 'utf-8' filesystem_encoding = 'utf-8'
DEBUG = 'CALIBRE_DEBUG' in os.environ DEBUG = hasenv('CALIBRE_DEBUG')
def debug(): def debug():
@ -98,7 +98,7 @@ def debug():
def _get_cache_dir(): def _get_cache_dir():
import errno import errno
confcache = os.path.join(config_dir, u'caches') confcache = os.path.join(config_dir, 'caches')
try: try:
os.makedirs(confcache) os.makedirs(confcache)
except EnvironmentError as err: except EnvironmentError as err:
@ -106,13 +106,9 @@ def _get_cache_dir():
raise raise
if isportable: if isportable:
return confcache return confcache
if 'CALIBRE_CACHE_DIRECTORY' in os.environ: ccd = getenv('CALIBRE_CACHE_DIRECTORY')
if iswindows: if ccd is not None:
ans = get_unicode_windows_env_var(u'CALIBRE_CACHE_DIRECTORY') ans = os.path.abspath(ccd)
else:
ans = os.path.abspath(os.environ['CALIBRE_CACHE_DIRECTORY'])
if isinstance(ans, bytes):
ans = ans.decode(filesystem_encoding)
try: try:
os.makedirs(ans) os.makedirs(ans)
return ans return ans
@ -123,13 +119,13 @@ def _get_cache_dir():
if iswindows: if iswindows:
w = plugins['winutil'][0] w = plugins['winutil'][0]
try: try:
candidate = os.path.join(w.special_folder_path(w.CSIDL_LOCAL_APPDATA), u'%s-cache'%__appname__) candidate = os.path.join(w.special_folder_path(w.CSIDL_LOCAL_APPDATA), '%s-cache'%__appname__)
except ValueError: except ValueError:
return confcache return confcache
elif isosx: elif isosx:
candidate = os.path.join(os.path.expanduser(u'~/Library/Caches'), __appname__) candidate = os.path.join(os.path.expanduser('~/Library/Caches'), __appname__)
else: else:
candidate = os.environ.get('XDG_CACHE_HOME', u'~/.cache') candidate = getenv('XDG_CACHE_HOME', '~/.cache')
candidate = os.path.join(os.path.expanduser(candidate), candidate = os.path.join(os.path.expanduser(candidate),
__appname__) __appname__)
if isinstance(candidate, bytes): if isinstance(candidate, bytes):
@ -207,7 +203,7 @@ class Plugins(collections.Mapping):
del sys.modules[name] del sys.modules[name]
except KeyError: except KeyError:
pass pass
plugin_err = u'' plugin_err = ''
try: try:
p = importlib.import_module(name) p = importlib.import_module(name)
except Exception as err: except Exception as err:
@ -241,8 +237,9 @@ if plugins is None:
CONFIG_DIR_MODE = 0o700 CONFIG_DIR_MODE = 0o700
if 'CALIBRE_CONFIG_DIRECTORY' in os.environ: cconfd = getenv('CALIBRE_CONFIG_DIRECTORY')
config_dir = os.path.abspath(os.environ['CALIBRE_CONFIG_DIRECTORY']) if cconfd is not None:
config_dir = os.path.abspath(cconfd)
elif iswindows: elif iswindows:
if plugins['winutil'][0] is None: if plugins['winutil'][0] is None:
raise Exception(plugins['winutil'][1]) raise Exception(plugins['winutil'][1])
@ -256,7 +253,7 @@ elif iswindows:
elif isosx: elif isosx:
config_dir = os.path.expanduser('~/Library/Preferences/calibre') config_dir = os.path.expanduser('~/Library/Preferences/calibre')
else: else:
bdir = os.path.abspath(os.path.expanduser(os.environ.get('XDG_CONFIG_HOME', '~/.config'))) bdir = os.path.abspath(os.path.expanduser(getenv('XDG_CONFIG_HOME', '~/.config')))
config_dir = os.path.join(bdir, 'calibre') config_dir = os.path.join(bdir, 'calibre')
try: try:
os.makedirs(config_dir, mode=CONFIG_DIR_MODE) os.makedirs(config_dir, mode=CONFIG_DIR_MODE)
@ -279,7 +276,7 @@ else:
# }}} # }}}
dv = os.environ.get('CALIBRE_DEVELOP_FROM') dv = getenv('CALIBRE_DEVELOP_FROM')
is_running_from_develop = bool(getattr(sys, 'frozen', False) and dv and os.path.abspath(dv) in sys.path) is_running_from_develop = bool(getattr(sys, 'frozen', False) and dv and os.path.abspath(dv) in sys.path)
del dv del dv
@ -303,7 +300,7 @@ def get_version():
def get_portable_base(): def get_portable_base():
'Return path to the directory that contains calibre-portable.exe or None' 'Return path to the directory that contains calibre-portable.exe or None'
if isportable: if isportable:
return os.path.dirname(os.path.dirname(get_unicode_windows_env_var(u'CALIBRE_PORTABLE_BUILD'))) return os.path.dirname(os.path.dirname(get_unicode_windows_env_var('CALIBRE_PORTABLE_BUILD')))
def get_unicode_windows_env_var(name): def get_unicode_windows_env_var(name):

24
src/polyglot/builtins.py
View File

@ -4,6 +4,7 @@
from __future__ import absolute_import, division, print_function, unicode_literals from __future__ import absolute_import, division, print_function, unicode_literals
import os
import sys import sys
is_py3 = sys.version_info.major >= 3 is_py3 = sys.version_info.major >= 3
@ -11,6 +12,10 @@ native_string_type = str
iterkeys = iter iterkeys = iter
def hasenv(x):
return getenv(x) is not None
def as_bytes(x, encoding='utf-8'): def as_bytes(x, encoding='utf-8'):
if isinstance(x, unicode_type): if isinstance(x, unicode_type):
return x.encode(encoding) return x.encode(encoding)
@ -87,6 +92,9 @@ if is_py3:
x = x.decode('utf-8') x = x.decode('utf-8')
return x return x
def getenv(x, default=None):
return os.environ.get(environ_item(x), default)
def exec_path(path, ctx=None): def exec_path(path, ctx=None):
ctx = ctx or {} ctx = ctx or {}
with open(path, 'rb') as f: with open(path, 'rb') as f:
@ -142,5 +150,21 @@ else:
x = x.encode('utf-8') x = x.encode('utf-8')
return x return x
if hasattr(sys, 'getwindowsversion'):
def getenv(x, default=None):
from calibre.constants import get_unicode_windows_env_var
if isinstance(x, bytes):
x = x.decode('mbcs', 'replace')
ans = get_unicode_windows_env_var(x)
if ans is None:
ans = default
return ans
else:
def getenv(x, default=None):
ans = os.environ.get(environ_item(x), default)
if isinstance(ans, bytes):
ans = ans.decode('utf-8', 'replace')
return ans
def reload(module): def reload(module):
return builtins.reload(module) return builtins.reload(module)