rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't enable warnings if log was never inited

Browse Source 
Otherwise, anything importing qtutils (which uses ignore_py_warnings
on module level) would enable warnings. This means pylint showed its own
warnings because of qute_pylint.config.
This commit is contained in:
Florian Bruhin 2016-07-25 13:03:58 +02:00
parent c3f53312af
commit 1564563662
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qutebrowser/utils/log.py
View File

@ -38,6 +38,8 @@ try:
except ImportError: except ImportError:
colorama = None colorama = None
_log_inited = False
COLORS = ['black', 'red', 'green', 'yellow', 'blue', 'purple', 'cyan', 'white'] COLORS = ['black', 'red', 'green', 'yellow', 'blue', 'purple', 'cyan', 'white']
COLOR_ESCAPES = {color: '\033[{}m'.format(i) COLOR_ESCAPES = {color: '\033[{}m'.format(i)
for i, color in enumerate(COLORS, start=30)} for i, color in enumerate(COLORS, start=30)}
@ -169,6 +171,8 @@ def init_log(args):
logging.captureWarnings(True) logging.captureWarnings(True)
_init_py_warnings() _init_py_warnings()
QtCore.qInstallMessageHandler(qt_message_handler) QtCore.qInstallMessageHandler(qt_message_handler)
global _log_inited
_log_inited = True
def _init_py_warnings(): def _init_py_warnings():
@ -189,9 +193,10 @@ def disable_qt_msghandler():
@contextlib.contextmanager @contextlib.contextmanager
def ignore_py_warnings(**kwargs): def ignore_py_warnings(**kwargs):
"""Contextmanager to temporarily hke certain Python warnings.""" """Contextmanager to temporarily disable certain Python warnings."""
warnings.filterwarnings('ignore', **kwargs) warnings.filterwarnings('ignore', **kwargs)
yield yield
if _log_inited:
_init_py_warnings() _init_py_warnings()