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 branch '3.0.x' into 7423_logging_non_string_object

Browse Source
This commit is contained in:
Takeshi KOMIYA 2020-04-09 02:05:08 +09:00 committed by GitHub
commit ee882c8ca9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -16,6 +16,7 @@ Features added
Bugs fixed Bugs fixed
---------- ----------
* #7428: py domain: a reference to class ``None`` emits a nitpicky warning
* #7423: crashed when giving a non-string object to logger * #7423: crashed when giving a non-string object to logger
Testing Testing

2
sphinx/domains/python.py
View File

@ -1311,7 +1311,7 @@ def builtin_resolver(app: Sphinx, env: BuildEnvironment,
if node.get('refdomain') != 'py': if node.get('refdomain') != 'py':
return None return None
elif node.get('reftype') == 'obj' and node.get('reftarget') == 'None': elif node.get('reftype') in ('class', 'obj') and node.get('reftarget') == 'None':
return contnode return contnode
elif node.get('reftype') in ('class', 'exc'): elif node.get('reftype') in ('class', 'exc'):
reftarget = node.get('reftarget') reftarget = node.get('reftarget')