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

py3: Fix load_plugin() not handling load failures

Browse Source
This commit is contained in:
Kovid Goyal 2019-03-26 07:57:37 +05:30
parent 1c846769db
commit 48d4c73f88
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/constants.py
View File

@ -203,12 +203,13 @@ class Plugins(collections.Mapping):
del sys.modules[name] del sys.modules[name]
except KeyError: except KeyError:
pass pass
plugin_err = u''
try: try:
p, err = importlib.import_module(name), '' p = importlib.import_module(name)
except Exception as err: except Exception as err:
p = None p = None
err = str(err) plugin_err = unicode_type(err)
self._plugins[name] = (p, err) self._plugins[name] = p, plugin_err
sys.path.remove(sys.extensions_location) sys.path.remove(sys.extensions_location)
def __iter__(self): def __iter__(self):