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

Fix winutil import not being run when CALIBRE_CONFIG_DIRECTORY is set

Browse Source
This commit is contained in:
Kovid Goyal 2020-10-18 19:01:56 +05:30
parent 17e6846cbe
commit 448b90425a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calibre/constants.py
View File

@ -287,6 +287,8 @@ class ExtensionsImporter:
sys.meta_path.insert(0, DeVendor()) sys.meta_path.insert(0, DeVendor())
sys.meta_path.append(ExtensionsImporter()) sys.meta_path.append(ExtensionsImporter())
if iswindows:
from calibre_extensions import winutil
class Plugins(collections.Mapping): class Plugins(collections.Mapping):
@ -332,7 +334,6 @@ cconfd = getenv('CALIBRE_CONFIG_DIRECTORY')
if cconfd is not None: if cconfd is not None:
config_dir = os.path.abspath(cconfd) config_dir = os.path.abspath(cconfd)
elif iswindows: elif iswindows:
from calibre_extensions import winutil
try: try:
config_dir = winutil.special_folder_path(winutil.CSIDL_APPDATA) config_dir = winutil.special_folder_path(winutil.CSIDL_APPDATA)
except ValueError: except ValueError: