From 448b90425affa9a3b1dde962c4e0b76ad66cb36f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 18 Oct 2020 19:01:56 +0530
Subject: [PATCH] Fix winutil import not being run when
 CALIBRE_CONFIG_DIRECTORY is set

---
 src/calibre/constants.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 7be575a121..ebe3dc0b3b 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -287,6 +287,8 @@ class ExtensionsImporter:
 
 sys.meta_path.insert(0, DeVendor())
 sys.meta_path.append(ExtensionsImporter())
+if iswindows:
+    from calibre_extensions import winutil
 
 
 class Plugins(collections.Mapping):
@@ -332,7 +334,6 @@ cconfd = getenv('CALIBRE_CONFIG_DIRECTORY')
 if cconfd is not None:
     config_dir = os.path.abspath(cconfd)
 elif iswindows:
-    from calibre_extensions import winutil
     try:
         config_dir = winutil.special_folder_path(winutil.CSIDL_APPDATA)
     except ValueError: