Add new types types to _INVALID_BUILTIN_CLASSES (#13262)

sphinx-doc · Jan 23, 2025 · 47bff3f · 47bff3f
1 parent ea5fc59
commit 47bff3f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/sphinx/util/typing.py b/sphinx/util/typing.py
@@ -62,6 +62,7 @@
     types.ClassMethodDescriptorType: 'types.ClassMethodDescriptorType',
     types.CodeType: 'types.CodeType',
     types.CoroutineType: 'types.CoroutineType',
+    types.EllipsisType: 'types.EllipsisType',
     types.FrameType: 'types.FrameType',
     types.FunctionType: 'types.FunctionType',
     types.GeneratorType: 'types.GeneratorType',
@@ -73,6 +74,8 @@
     types.MethodType: 'types.MethodType',
     types.MethodWrapperType: 'types.MethodWrapperType',
     types.ModuleType: 'types.ModuleType',
+    types.NoneType: 'types.NoneType',
+    types.NotImplementedType: 'types.NotImplementedType',
     types.TracebackType: 'types.TracebackType',
     types.WrapperDescriptorType: 'types.WrapperDescriptorType',
 }

diff --git a/tests/test_util/test_util_typing.py b/tests/test_util/test_util_typing.py
@@ -26,6 +26,7 @@
     ClassMethodDescriptorType,
     CodeType,
     CoroutineType,
+    EllipsisType,
     FrameType,
     FunctionType,
     GeneratorType,
@@ -37,6 +38,8 @@
     MethodType,
     MethodWrapperType,
     ModuleType,
+    NoneType,
+    NotImplementedType,
     TracebackType,
     WrapperDescriptorType,
 )
@@ -143,6 +146,7 @@ def test_is_invalid_builtin_class():
         ClassMethodDescriptorType,
         CodeType,
         CoroutineType,
+        EllipsisType,
         FrameType,
         FunctionType,
         GeneratorType,
@@ -154,6 +158,8 @@ def test_is_invalid_builtin_class():
         MethodType,
         MethodWrapperType,
         ModuleType,
+        NoneType,
+        NotImplementedType,
         TracebackType,
         WrapperDescriptorType,
     }
@@ -179,6 +185,7 @@ def test_is_invalid_builtin_class():
     assert ClassMethodDescriptorType.__module__ == 'builtins'
     assert CodeType.__module__ == 'builtins'
     assert CoroutineType.__module__ == 'builtins'
+    assert EllipsisType.__module__ == 'builtins'
     assert FrameType.__module__ == 'builtins'
     assert FunctionType.__module__ == 'builtins'
     assert GeneratorType.__module__ == 'builtins'
@@ -190,6 +197,8 @@ def test_is_invalid_builtin_class():
     assert MethodType.__module__ == 'builtins'
     assert MethodWrapperType.__module__ == 'builtins'
     assert ModuleType.__module__ == 'builtins'
+    assert NoneType.__module__ == 'builtins'
+    assert NotImplementedType.__module__ == 'builtins'
     assert TracebackType.__module__ == 'builtins'
     assert WrapperDescriptorType.__module__ == 'builtins'