fix NoneType

Author: KotlinIsland

stdlib/_typeshed/__init__.pyi

@@ -192,13 +192,10 @@ WriteableBuffer = Union[bytearray, memoryview, array.array[Any], mmap.mmap, ctyp
 ReadableBuffer = Union[ReadOnlyBuffer, WriteableBuffer]  # stable
 
 # stable
-if sys.version_info >= (3, 10):
-    from types import NoneType as NoneType
-else:
-    # Used by type checkers for checks involving None (does not exist at runtime)
-    @final
-    class NoneType:
-        def __bool__(self) -> Literal[False]: ...
+# Used by type checkers for checks involving None (does not exist at runtime)
+@final
+class NoneType:
+    def __bool__(self) -> Literal[False]: ...
 
 # This is an internal CPython type that is like, but subtly different from, a NamedTuple
 # Subclasses of this type are found in multiple modules.

stdlib/types.pyi

@@ -40,7 +40,7 @@ class _Cell:
 
 # Make sure this class definition stays roughly in line with `builtins.function`
 @final
-class FunctionType:
+class FunctionType(Callable):
     __closure__: tuple[_Cell, ...] | None
     __code__: CodeType
     __defaults__: tuple[Any, ...] | None
@@ -279,7 +279,7 @@ class _StaticFunctionType:
     def __get__(self, obj: object | None, type: type | None) -> FunctionType: ...
 
 @final
-class MethodType:
+class MethodType(Callable):
     __closure__: tuple[_Cell, ...] | None  # inherited from the added function
     __defaults__: tuple[Any, ...] | None  # inherited from the added function
     __func__: _StaticFunctionType
@@ -290,7 +290,7 @@ class MethodType:
     def __call__(self, *args: Any, **kwargs: Any) -> Any: ...
 
 @final
-class BuiltinFunctionType:
+class BuiltinFunctionType(Callable):
     __self__: object | ModuleType
     __name__: str
     __qualname__: str
@@ -300,14 +300,14 @@ BuiltinMethodType = BuiltinFunctionType
 
 if sys.version_info >= (3, 7):
     @final
-    class WrapperDescriptorType:
+    class WrapperDescriptorType(Callable):
         __name__: str
         __qualname__: str
         __objclass__: type
         def __call__(self, *args: Any, **kwargs: Any) -> Any: ...
         def __get__(self, obj: Any, type: type = ...) -> Any: ...
     @final
-    class MethodWrapperType:
+    class MethodWrapperType(Callable):
         __self__: object
         __name__: str
         __qualname__: str
@@ -316,14 +316,14 @@ if sys.version_info >= (3, 7):
         def __eq__(self, other: Any) -> bool: ...
         def __ne__(self, other: Any) -> bool: ...
     @final
-    class MethodDescriptorType:
+    class MethodDescriptorType(Callable):
         __name__: str
         __qualname__: str
         __objclass__: type
         def __call__(self, *args: Any, **kwargs: Any) -> Any: ...
         def __get__(self, obj: Any, type: type = ...) -> Any: ...
     @final
-    class ClassMethodDescriptorType:
+    class ClassMethodDescriptorType(Callable):
         __name__: str
         __qualname__: str
         __objclass__: type
@@ -424,9 +424,7 @@ if sys.version_info >= (3, 9):
         def __getattr__(self, name: str) -> Any: ...  # incomplete
 
 if sys.version_info >= (3, 10):
-    @final
-    class NoneType:
-        def __bool__(self) -> Literal[False]: ...
+    NoneType = type(None)
     EllipsisType = ellipsis  # noqa F811 from builtins
     from builtins import _NotImplementedType