Merge branch '3.0.x' into 7423_logging_non_string_object

sphinx-doc · Apr 8, 2020 · ee882c8 · ee882c8
2 parents 1ca2207 + 4caa7d7
commit ee882c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGES b/CHANGES
@@ -16,6 +16,7 @@ Features added
 Bugs fixed
 ----------
 
+* #7428: py domain: a reference to class ``None`` emits a nitpicky warning
 * #7423: crashed when giving a non-string object to logger
 
 Testing

diff --git a/sphinx/domains/python.py b/sphinx/domains/python.py
@@ -1311,7 +1311,7 @@ def istyping(s: str) -> bool:
 
     if node.get('refdomain') != 'py':
         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
     elif node.get('reftype') in ('class', 'exc'):
         reftarget = node.get('reftarget')