mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Prevent custom plugins from messing with sys.stdout and sys.stderr
This commit is contained in:
parent
4297aa3c86
commit
8677789312
@ -504,6 +504,7 @@ def initialize_plugins():
|
|||||||
for p in conflicts:
|
for p in conflicts:
|
||||||
remove_plugin(p)
|
remove_plugin(p)
|
||||||
external_plugins = config['plugins']
|
external_plugins = config['plugins']
|
||||||
|
ostdout, ostderr = sys.stdout, sys.stderr
|
||||||
for zfp in list(external_plugins) + builtin_plugins:
|
for zfp in list(external_plugins) + builtin_plugins:
|
||||||
try:
|
try:
|
||||||
if not isinstance(zfp, type):
|
if not isinstance(zfp, type):
|
||||||
@ -522,6 +523,9 @@ def initialize_plugins():
|
|||||||
print 'Failed to initialize plugin:', repr(zfp)
|
print 'Failed to initialize plugin:', repr(zfp)
|
||||||
if DEBUG:
|
if DEBUG:
|
||||||
traceback.print_exc()
|
traceback.print_exc()
|
||||||
|
# Prevent a custom plugin from overriding stdout/stderr as this breaks
|
||||||
|
# ipython
|
||||||
|
sys.stdout, sys.stderr = ostdout, ostderr
|
||||||
_initialized_plugins.sort(cmp=lambda x,y:cmp(x.priority, y.priority), reverse=True)
|
_initialized_plugins.sort(cmp=lambda x,y:cmp(x.priority, y.priority), reverse=True)
|
||||||
reread_filetype_plugins()
|
reread_filetype_plugins()
|
||||||
reread_metadata_plugins()
|
reread_metadata_plugins()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user