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

Merge pull request #7441 from tk0miya/7423_logging_non_string_object

Browse Source 
Fix #7423: crashed when giving a non-string object to logger
This commit is contained in:
Takeshi KOMIYA 2020-04-10 00:16:46 +09:00 committed by GitHub
commit 9002b6c9ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -22,6 +22,7 @@ Bugs fixed
* #7418: std domain: duplication warning for glossary terms is case insensitive * #7418: std domain: duplication warning for glossary terms is case insensitive
* #7438: C++, fix merging overloaded functions in parallel builds. * #7438: C++, fix merging overloaded functions in parallel builds.
* #7422: autodoc: fails with ValueError when using autodoc_mock_imports * #7422: autodoc: fails with ValueError when using autodoc_mock_imports
* #7423: crashed when giving a non-string object to logger
Testing Testing
-------- --------

2
sphinx/util/logging.py
View File

@ -412,7 +412,7 @@ class WarningIsErrorFilter(logging.Filter):
message = record.msg # use record.msg itself message = record.msg # use record.msg itself
if location: if location:
raise SphinxWarning(location + ":" + message) raise SphinxWarning(location + ":" + str(message))
else: else:
raise SphinxWarning(message) raise SphinxWarning(message)
else: else:

8
tests/test_util_logging.py
View File

@ -48,6 +48,14 @@ def test_info_and_warning(app, status, warning):
assert 'message5' in warning.getvalue() assert 'message5' in warning.getvalue()
def test_Exception(app, status, warning):
logging.setup(app, status, warning)
logger = logging.getLogger(__name__)
logger.info(Exception)
assert "<class 'Exception'>" in status.getvalue()
def test_verbosity_filter(app, status, warning): def test_verbosity_filter(app, status, warning):
# verbosity = 0: INFO # verbosity = 0: INFO
app.verbosity = 0 app.verbosity = 0