Merge branch 'master' into fix-isinstance-native-interpreted-subclass

Author: BobTheBuidler

LICENSE

@@ -227,3 +227,38 @@ FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+= = = = =
+
+Files under lib-rt/base64 are licensed under the following license.
+
+= = = = =
+
+Copyright (c) 2005-2007, Nick Galbreath
+Copyright (c) 2015-2018, Wojciech Muła
+Copyright (c) 2016-2017, Matthieu Darbois
+Copyright (c) 2013-2022, Alfred Klomp
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+- Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

mypy/exprtotype.py

@@ -100,7 +100,9 @@ def expr_to_unanalyzed_type(
         else:
             raise TypeTranslationError()
     elif isinstance(expr, IndexExpr):
-        base = expr_to_unanalyzed_type(expr.base, options, allow_new_syntax, expr)
+        base = expr_to_unanalyzed_type(
+            expr.base, options, allow_new_syntax, expr, lookup_qualified=lookup_qualified
+        )
         if isinstance(base, UnboundType):
             if base.args:
                 raise TypeTranslationError()
@@ -124,9 +126,18 @@ def expr_to_unanalyzed_type(
                     # TODO: this is not the optimal solution as we are basically getting rid
                     # of the Annotation definition and only returning the type information,
                     # losing all the annotations.
-                    return expr_to_unanalyzed_type(args[0], options, allow_new_syntax, expr)
+                    return expr_to_unanalyzed_type(
+                        args[0], options, allow_new_syntax, expr, lookup_qualified=lookup_qualified
+                    )
             base.args = tuple(
-                expr_to_unanalyzed_type(arg, options, allow_new_syntax, expr, allow_unpack=True)
+                expr_to_unanalyzed_type(
+                    arg,
+                    options,
+                    allow_new_syntax,
+                    expr,
+                    allow_unpack=True,
+                    lookup_qualified=lookup_qualified,
+                )
                 for arg in args
             )
             if not base.args:
@@ -141,8 +152,12 @@ def expr_to_unanalyzed_type(
     ):
         return UnionType(
             [
-                expr_to_unanalyzed_type(expr.left, options, allow_new_syntax),
-                expr_to_unanalyzed_type(expr.right, options, allow_new_syntax),
+                expr_to_unanalyzed_type(
+                    expr.left, options, allow_new_syntax, lookup_qualified=lookup_qualified
+                ),
+                expr_to_unanalyzed_type(
+                    expr.right, options, allow_new_syntax, lookup_qualified=lookup_qualified
+                ),
             ],
             uses_pep604_syntax=True,
         )
@@ -178,12 +193,16 @@ def expr_to_unanalyzed_type(
                     if typ is not default_type:
                         # Two types
                         raise TypeTranslationError()
-                    typ = expr_to_unanalyzed_type(arg, options, allow_new_syntax, expr)
+                    typ = expr_to_unanalyzed_type(
+                        arg, options, allow_new_syntax, expr, lookup_qualified=lookup_qualified
+                    )
                     continue
                 else:
                     raise TypeTranslationError()
             elif i == 0:
-                typ = expr_to_unanalyzed_type(arg, options, allow_new_syntax, expr)
+                typ = expr_to_unanalyzed_type(
+                    arg, options, allow_new_syntax, expr, lookup_qualified=lookup_qualified
+                )
             elif i == 1:
                 name = _extract_argument_name(arg)
             else:
@@ -192,7 +211,14 @@ def expr_to_unanalyzed_type(
     elif isinstance(expr, ListExpr):
         return TypeList(
             [
-                expr_to_unanalyzed_type(t, options, allow_new_syntax, expr, allow_unpack=True)
+                expr_to_unanalyzed_type(
+                    t,
+                    options,
+                    allow_new_syntax,
+                    expr,
+                    allow_unpack=True,
+                    lookup_qualified=lookup_qualified,
+                )
                 for t in expr.items
             ],
             line=expr.line,
@@ -203,7 +229,9 @@ def expr_to_unanalyzed_type(
     elif isinstance(expr, BytesExpr):
         return parse_type_string(expr.value, "builtins.bytes", expr.line, expr.column)
     elif isinstance(expr, UnaryExpr):
-        typ = expr_to_unanalyzed_type(expr.expr, options, allow_new_syntax)
+        typ = expr_to_unanalyzed_type(
+            expr.expr, options, allow_new_syntax, lookup_qualified=lookup_qualified
+        )
         if isinstance(typ, RawExpressionType):
             if isinstance(typ.literal_value, int):
                 if expr.op == "-":
@@ -225,7 +253,10 @@ def expr_to_unanalyzed_type(
         return EllipsisType(expr.line)
     elif allow_unpack and isinstance(expr, StarExpr):
         return UnpackType(
-            expr_to_unanalyzed_type(expr.expr, options, allow_new_syntax), from_star_syntax=True
+            expr_to_unanalyzed_type(
+                expr.expr, options, allow_new_syntax, lookup_qualified=lookup_qualified
+            ),
+            from_star_syntax=True,
         )
     elif isinstance(expr, DictExpr):
         if not expr.items:
@@ -236,12 +267,18 @@ def expr_to_unanalyzed_type(
             if not isinstance(item_name, StrExpr):
                 if item_name is None:
                     extra_items_from.append(
-                        expr_to_unanalyzed_type(value, options, allow_new_syntax, expr)
+                        expr_to_unanalyzed_type(
+                            value,
+                            options,
+                            allow_new_syntax,
+                            expr,
+                            lookup_qualified=lookup_qualified,
+                        )
                     )
                     continue
                 raise TypeTranslationError()
             items[item_name.value] = expr_to_unanalyzed_type(
-                value, options, allow_new_syntax, expr
+                value, options, allow_new_syntax, expr, lookup_qualified=lookup_qualified
             )
         result = TypedDictType(
             items, set(), set(), Instance(MISSING_FALLBACK, ()), expr.line, expr.column

mypy/typeshed/stdlib/_compression.pyi

@@ -1,6 +1,6 @@
 # _compression is replaced by compression._common._streams on Python 3.14+ (PEP-784)
 
-from _typeshed import Incomplete, WriteableBuffer
+from _typeshed import ReadableBuffer, WriteableBuffer
 from collections.abc import Callable
 from io import DEFAULT_BUFFER_SIZE, BufferedIOBase, RawIOBase
 from typing import Any, Protocol, type_check_only
@@ -13,13 +13,24 @@ class _Reader(Protocol):
     def seekable(self) -> bool: ...
     def seek(self, n: int, /) -> Any: ...
 
+@type_check_only
+class _Decompressor(Protocol):
+    def decompress(self, data: ReadableBuffer, /, max_length: int = ...) -> bytes: ...
+    @property
+    def unused_data(self) -> bytes: ...
+    @property
+    def eof(self) -> bool: ...
+    # `zlib._Decompress` does not have next property, but `DecompressReader` calls it:
+    # @property
+    # def needs_input(self) -> bool: ...
+
 class BaseStream(BufferedIOBase): ...
 
 class DecompressReader(RawIOBase):
     def __init__(
         self,
         fp: _Reader,
-        decomp_factory: Callable[..., Incomplete],
+        decomp_factory: Callable[..., _Decompressor],
         trailing_error: type[Exception] | tuple[type[Exception], ...] = (),
         **decomp_args: Any,  # These are passed to decomp_factory.
     ) -> None: ...

mypy/typeshed/stdlib/asyncio/protocols.pyi

@@ -14,7 +14,7 @@ class BaseProtocol:
 
 class Protocol(BaseProtocol):
     # Need annotation or mypy will complain about 'Cannot determine type of "__slots__" in base class'
-    __slots__: tuple[()] = ()
+    __slots__: tuple[str, ...] = ()
     def data_received(self, data: bytes) -> None: ...
     def eof_received(self) -> bool | None: ...
 
@@ -35,7 +35,7 @@ class DatagramProtocol(BaseProtocol):
     def error_received(self, exc: Exception) -> None: ...
 
 class SubprocessProtocol(BaseProtocol):
-    __slots__: tuple[()] = ()
+    __slots__: tuple[str, ...] = ()
     def pipe_data_received(self, fd: int, data: bytes) -> None: ...
     def pipe_connection_lost(self, fd: int, exc: Exception | None) -> None: ...
     def process_exited(self) -> None: ...

mypy/typeshed/stdlib/builtins.pyi

@@ -42,6 +42,7 @@ from typing import (  # noqa: Y022,UP035
     Any,
     BinaryIO,
     ClassVar,
+    Final,
     Generic,
     Mapping,
     MutableMapping,
@@ -188,8 +189,9 @@ class type:
     __bases__: tuple[type, ...]
     @property
     def __basicsize__(self) -> int: ...
-    @property
-    def __dict__(self) -> types.MappingProxyType[str, Any]: ...  # type: ignore[override]
+    # type.__dict__ is read-only at runtime, but that can't be expressed currently.
+    # See https://github.com/python/typeshed/issues/11033 for a discussion.
+    __dict__: Final[types.MappingProxyType[str, Any]]  # type: ignore[assignment]
     @property
     def __dictoffset__(self) -> int: ...
     @property
@@ -1267,13 +1269,6 @@ class property:
     def __set__(self, instance: Any, value: Any, /) -> None: ...
     def __delete__(self, instance: Any, /) -> None: ...
 
-@final
-@type_check_only
-class _NotImplementedType(Any):
-    __call__: None
-
-NotImplemented: _NotImplementedType
-
 def abs(x: SupportsAbs[_T], /) -> _T: ...
 def all(iterable: Iterable[object], /) -> bool: ...
 def any(iterable: Iterable[object], /) -> bool: ...
@@ -1932,14 +1927,14 @@ def __import__(
 def __build_class__(func: Callable[[], CellType | Any], name: str, /, *bases: Any, metaclass: Any = ..., **kwds: Any) -> Any: ...
 
 if sys.version_info >= (3, 10):
-    from types import EllipsisType
+    from types import EllipsisType, NotImplementedType
 
     # Backwards compatibility hack for folks who relied on the ellipsis type
     # existing in typeshed in Python 3.9 and earlier.
     ellipsis = EllipsisType
 
     Ellipsis: EllipsisType
-
+    NotImplemented: NotImplementedType
 else:
     # Actually the type of Ellipsis is <type 'ellipsis'>, but since it's
     # not exposed anywhere under that name, we make it private here.
@@ -1949,6 +1944,12 @@ else:
 
     Ellipsis: ellipsis
 
+    @final
+    @type_check_only
+    class _NotImplementedType(Any): ...
+
+    NotImplemented: _NotImplementedType
+
 @disjoint_base
 class BaseException:
     args: tuple[Any, ...]

mypy/typeshed/stdlib/compression/_common/_streams.pyi

@@ -1,4 +1,4 @@
-from _typeshed import Incomplete, WriteableBuffer
+from _typeshed import ReadableBuffer, WriteableBuffer
 from collections.abc import Callable
 from io import DEFAULT_BUFFER_SIZE, BufferedIOBase, RawIOBase
 from typing import Any, Protocol, type_check_only
@@ -11,13 +11,24 @@ class _Reader(Protocol):
     def seekable(self) -> bool: ...
     def seek(self, n: int, /) -> Any: ...
 
+@type_check_only
+class _Decompressor(Protocol):
+    def decompress(self, data: ReadableBuffer, /, max_length: int = ...) -> bytes: ...
+    @property
+    def unused_data(self) -> bytes: ...
+    @property
+    def eof(self) -> bool: ...
+    # `zlib._Decompress` does not have next property, but `DecompressReader` calls it:
+    # @property
+    # def needs_input(self) -> bool: ...
+
 class BaseStream(BufferedIOBase): ...
 
 class DecompressReader(RawIOBase):
     def __init__(
         self,
         fp: _Reader,
-        decomp_factory: Callable[..., Incomplete],  # Consider backporting changes to _compression
+        decomp_factory: Callable[..., _Decompressor],  # Consider backporting changes to _compression
         trailing_error: type[Exception] | tuple[type[Exception], ...] = (),
         **decomp_args: Any,  # These are passed to decomp_factory.
     ) -> None: ...

mypy/typeshed/stdlib/html/parser.pyi

@@ -9,7 +9,8 @@ class HTMLParser(ParserBase):
     # Added in Python 3.9.23, 3.10.18, 3.11.13, 3.12.11, 3.13.6
     RCDATA_CONTENT_ELEMENTS: Final[tuple[str, ...]]
 
-    def __init__(self, *, convert_charrefs: bool = True) -> None: ...
+    # `scripting` parameter added in Python 3.9.25, 3.10.20, 3.11.15, 3.12.13, 3.13.10, 3.14.1
+    def __init__(self, *, convert_charrefs: bool = True, scripting: bool = False) -> None: ...
     def feed(self, data: str) -> None: ...
     def close(self) -> None: ...
     def get_starttag_text(self) -> str | None: ...

mypy/typeshed/stdlib/http/client.pyi

@@ -166,6 +166,7 @@ class HTTPResponse(io.BufferedIOBase, BinaryIO):  # type: ignore[misc]  # incomp
     def begin(self) -> None: ...
 
 class HTTPConnection:
+    blocksize: int
     auto_open: int  # undocumented
     debuglevel: int
     default_port: int  # undocumented

mypy/typeshed/stdlib/imaplib.pyi

@@ -26,6 +26,7 @@ class IMAP4:
     class error(Exception): ...
     class abort(error): ...
     class readonly(abort): ...
+    utf8_enabled: bool
     mustquote: Pattern[str]
     debug: int
     state: str

mypy/typeshed/stdlib/importlib/util.pyi

@@ -12,7 +12,9 @@ from importlib._bootstrap_external import (
     spec_from_file_location as spec_from_file_location,
 )
 from importlib.abc import Loader
-from typing_extensions import ParamSpec, deprecated
+from types import TracebackType
+from typing import Literal
+from typing_extensions import ParamSpec, Self, deprecated
 
 _P = ParamSpec("_P")
 
@@ -44,6 +46,18 @@ class LazyLoader(Loader):
 
 def source_hash(source_bytes: ReadableBuffer) -> bytes: ...
 
+if sys.version_info >= (3, 12):
+    class _incompatible_extension_module_restrictions:
+        def __init__(self, *, disable_check: bool) -> None: ...
+        disable_check: bool
+        old: Literal[-1, 0, 1]  # exists only while entered
+        def __enter__(self) -> Self: ...
+        def __exit__(
+            self, exc_type: type[BaseException] | None, exc_val: BaseException | None, exc_tb: TracebackType | None
+        ) -> None: ...
+        @property
+        def override(self) -> Literal[-1, 1]: ...  # undocumented
+
 if sys.version_info >= (3, 14):
     __all__ = [
         "LazyLoader",