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

No need to manipulate sys.path when importing calibre extensions in frozen builds

Browse Source
This commit is contained in:
Kovid Goyal 2020-09-30 12:33:56 +05:30
parent 29bfafa676
commit ccdfbe96d5
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/constants.py
View File

@ -214,7 +214,8 @@ class Plugins(collections.Mapping):
def load_plugin(self, name):
if name in self._plugins:
return
sys.path.insert(0, plugins_loc)
if not isfrozen:
sys.path.insert(0, plugins_loc)
try:
del sys.modules[name]
except KeyError:
@ -229,7 +230,8 @@ class Plugins(collections.Mapping):
except Exception:
plugin_err = as_unicode(native_string_type(err), encoding=preferred_encoding, errors='replace')
self._plugins[name] = p, plugin_err
sys.path.remove(plugins_loc)
if not isfrozen:
sys.path.remove(plugins_loc)
def __iter__(self):
return iter(self.plugins)