From 27584dc8a194cdbc86f985997d63f62c9300dd1b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 2 Oct 2020 22:45:24 +0530
Subject: [PATCH] Delegate to bypy to tell us if we are running from develop

---
 src/calibre/constants.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 2891e67fac..aeea468e56 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -297,9 +297,15 @@ else:
 # }}}
 
 
-dv = getenv('CALIBRE_DEVELOP_FROM')
-is_running_from_develop = bool(getattr(sys, 'frozen', False) and dv and os.path.abspath(dv) in sys.path)
-del dv
+is_running_from_develop = False
+if getattr(sys, 'frozen', False):
+    try:
+        from bypy_importer import running_in_develop_mode
+    except ImportError:
+        pass
+    else:
+        is_running_from_develop = running_in_develop_mode()
+
 in_develop_mode = getenv('CALIBRE_ENABLE_DEVELOP_MODE') == '1'