IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix #9979: Error level messages were displayed as warning messages

Browse Source
This commit is contained in:
Takeshi KOMIYA
2021-12-17 01:45:18 +09:00
parent 8d0fd9e74a
commit a9a9bd2563
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@@ -51,6 +51,7 @@ Bugs fixed
* #9940: LaTeX: Multi-function declaration in Python domain has cramped
vertical spacing in latexpdf output
* #9390: texinfo: Do not emit labels inside footnotes
* #9979: Error level messages were displayed as warning messages
Testing
--------

9
sphinx/util/logging.py
View File

@@ -111,7 +111,14 @@ class SphinxInfoLogRecord(SphinxLogRecord):
class SphinxWarningLogRecord(SphinxLogRecord):
"""Warning log record class supporting location"""
prefix = 'WARNING: '
@property
def prefix(self) -> str: # type: ignore
if self.levelno >= logging.CRITICAL:
return 'CRITICAL: '
elif self.levelno >= logging.ERROR:
return 'ERROR: '
else:
return 'WARNING: '
class SphinxLoggerAdapter(logging.LoggerAdapter):

10
tests/test_util_logging.py
View File

@@ -41,9 +41,9 @@ def test_info_and_warning(app, status, warning):
assert 'message1' not in warning.getvalue()
assert 'message2' not in warning.getvalue()
assert 'message3' in warning.getvalue()
assert 'message4' in warning.getvalue()
assert 'message5' in warning.getvalue()
assert 'WARNING: message3' in warning.getvalue()
assert 'CRITICAL: message4' in warning.getvalue()
assert 'ERROR: message5' in warning.getvalue()
def test_Exception(app, status, warning):
@@ -305,8 +305,8 @@ def test_colored_logs(app, status, warning):
assert 'message2\n' in status.getvalue() # not colored
assert 'message3\n' in status.getvalue() # not colored
assert colorize('red', 'WARNING: message4') in warning.getvalue()
assert 'WARNING: message5\n' in warning.getvalue() # not colored
assert colorize('darkred', 'WARNING: message6') in warning.getvalue()
assert 'CRITICAL: message5\n' in warning.getvalue() # not colored
assert colorize('darkred', 'ERROR: message6') in warning.getvalue()
# color specification
logger.debug('message7', color='white')