Merge branch 'main' into stubs-pygments-complete-misc

Author: brianschubert

stdlib/_operator.pyi

@@ -1,5 +1,15 @@
 import sys
-from _typeshed import SupportsGetItem, SupportsMul, SupportsRMul
+from _typeshed import (
+    SupportsAdd,
+    SupportsGetItem,
+    SupportsMod,
+    SupportsMul,
+    SupportsRAdd,
+    SupportsRMod,
+    SupportsRMul,
+    SupportsRSub,
+    SupportsSub,
+)
 from collections.abc import Callable, Container, Iterable, MutableMapping, MutableSequence, Sequence
 from operator import attrgetter as attrgetter, itemgetter as itemgetter, methodcaller as methodcaller
 from typing import Any, AnyStr, Protocol, SupportsAbs, SupportsIndex, TypeVar, overload, type_check_only
@@ -59,14 +69,20 @@ def truth(a: object, /) -> bool: ...
 def is_(a: object, b: object, /) -> bool: ...
 def is_not(a: object, b: object, /) -> bool: ...
 def abs(a: SupportsAbs[_T], /) -> _T: ...
-def add(a, b, /): ...
+@overload
+def add(a: SupportsAdd[_T_contra, _T_co], b: _T_contra, /) -> _T_co: ...
+@overload
+def add(a: _T_contra, b: SupportsRAdd[_T_contra, _T_co], /) -> _T_co: ...
 def and_(a, b, /): ...
 def floordiv(a, b, /): ...
 def index(a: SupportsIndex, /) -> int: ...
 def inv(a: _SupportsInversion[_T_co], /) -> _T_co: ...
 def invert(a: _SupportsInversion[_T_co], /) -> _T_co: ...
 def lshift(a, b, /): ...
-def mod(a, b, /): ...
+@overload
+def mod(a: SupportsMod[_T_contra, _T_co], b: _T_contra, /) -> _T_co: ...
+@overload
+def mod(a: _T_contra, b: SupportsRMod[_T_contra, _T_co], /) -> _T_co: ...
 @overload
 def mul(a: SupportsMul[_T_contra, _T_co], b: _T_contra, /) -> _T_co: ...
 @overload
@@ -77,7 +93,10 @@ def or_(a, b, /): ...
 def pos(a: _SupportsPos[_T_co], /) -> _T_co: ...
 def pow(a, b, /): ...
 def rshift(a, b, /): ...
-def sub(a, b, /): ...
+@overload
+def sub(a: SupportsSub[_T_contra, _T_co], b: _T_contra, /) -> _T_co: ...
+@overload
+def sub(a: _T_contra, b: SupportsRSub[_T_contra, _T_co], /) -> _T_co: ...
 def truediv(a, b, /): ...
 def xor(a, b, /): ...
 def concat(a: Sequence[_T], b: Sequence[_T], /) -> Sequence[_T]: ...

stdlib/_typeshed/__init__.pyi

@@ -126,6 +126,12 @@ class SupportsMul(Protocol[_T_contra, _T_co]):
 class SupportsRMul(Protocol[_T_contra, _T_co]):
     def __rmul__(self, x: _T_contra, /) -> _T_co: ...
 
+class SupportsMod(Protocol[_T_contra, _T_co]):
+    def __mod__(self, other: _T_contra, /) -> _T_co: ...
+
+class SupportsRMod(Protocol[_T_contra, _T_co]):
+    def __rmod__(self, other: _T_contra, /) -> _T_co: ...
+
 class SupportsDivMod(Protocol[_T_contra, _T_co]):
     def __divmod__(self, other: _T_contra, /) -> _T_co: ...
 

stubs/Pygments/@tests/stubtest_allowlist.txt

@@ -2,34 +2,21 @@
 pygments.lexer.LexerMeta.__new__
 pygments.style.StyleMeta.__new__
 
-# Defined in lexer classes, intended to be used as static method, but doesn't use @staticmethod
-pygments.lexer.Lexer(Meta)?.analyse_text
-
 # Inheriting from tuple is weird
 pygments.token._TokenType.__init__
 
 # Cannot import in stubtest (SystemExit: 2)
 pygments.__main__
 
-# Class attributes that are typed in the metaclass instead. See comment in stubs.
+# Class attributes that are set to None in the base class, but are
+# always overridden with a non-None value in subclasses.
 pygments.lexer.Lexer.name
-pygments.lexer.Lexer.aliases
-pygments.lexer.Lexer.filenames
-pygments.lexer.Lexer.alias_filenames
-pygments.lexer.Lexer.mimetypes
-pygments.lexer.Lexer.priority
 pygments.lexer.Lexer.url
 pygments.lexer.Lexer.version_added
-pygments.style.Style.background_color
-pygments.style.Style.highlight_color
-pygments.style.Style.line_number_color
-pygments.style.Style.line_number_background_color
-pygments.style.Style.line_number_special_color
-pygments.style.Style.line_number_special_background_color
-pygments.style.Style.styles
-pygments.style.Style.name
-pygments.style.Style.aliases
-pygments.style.Style.web_style_gallery_exclude
+
+# Class attributes that are set to None in the base class, but are
+# always overridden with a non-None value in subclasses.
+pygments.formatter.Formatter.name
 
 # Individual lexers and styles submodules are not stubbed at this time.
 pygments\.lexers\.(?!get_|find_|load_|guess_).*

stubs/Pygments/@tests/test_cases/check_pygments.py

@@ -0,0 +1,10 @@
+from typing_extensions import assert_type
+
+from pygments.style import Style, _StyleDict
+from pygments.token import _TokenType
+
+
+def test_style_class_iterable(style_class: type[Style]) -> None:
+    for t, d in style_class:
+        assert_type(t, _TokenType)
+        assert_type(d, _StyleDict)

stubs/Pygments/pygments/formatter.pyi

@@ -1,27 +1,58 @@
 import types
-from _typeshed import Incomplete
-from typing import Any, Generic, TypeVar, overload
+from _typeshed import SupportsWrite
+from collections.abc import Iterable, Sequence
+from typing import Any, ClassVar, Generic, TypeVar, overload
+
+from pygments.style import Style
+from pygments.token import _TokenType
 
 _T = TypeVar("_T", str, bytes)
 
 __all__ = ["Formatter"]
 
 class Formatter(Generic[_T]):
-    name: Incomplete
-    aliases: Incomplete
-    filenames: Incomplete
-    unicodeoutput: bool
-    style: Incomplete
-    full: Incomplete
-    title: Incomplete
-    encoding: Incomplete
-    options: Incomplete
+    name: ClassVar[str]  # Set to None, but always overridden with a non-None value in subclasses.
+    aliases: ClassVar[Sequence[str]]  # Not intended to be mutable
+    filenames: ClassVar[Sequence[str]]  # Not intended to be mutable
+    unicodeoutput: ClassVar[bool]
+    style: type[Style]
+    full: bool
+    title: str
+    encoding: str | None
+    options: dict[str, Any]  # arbitrary values used by subclasses
     @overload
-    def __init__(self: Formatter[str], *, encoding: None = None, outencoding: None = None, **options) -> None: ...
+    def __init__(
+        self: Formatter[str],
+        *,
+        style: type[Style] | str = "default",
+        full: bool = False,
+        title: str = "",
+        encoding: None = None,
+        outencoding: None = None,
+        **options: Any,  # arbitrary values used by subclasses
+    ) -> None: ...
     @overload
-    def __init__(self: Formatter[bytes], *, encoding: str, outencoding: None = None, **options) -> None: ...
+    def __init__(
+        self: Formatter[bytes],
+        *,
+        style: type[Style] | str = "default",
+        full: bool = False,
+        title: str = "",
+        encoding: str,
+        outencoding: None = None,
+        **options: Any,  # arbitrary values used by subclasses
+    ) -> None: ...
     @overload
-    def __init__(self: Formatter[bytes], *, encoding: None = None, outencoding: str, **options) -> None: ...
+    def __init__(
+        self: Formatter[bytes],
+        *,
+        style: type[Style] | str = "default",
+        full: bool = False,
+        title: str = "",
+        encoding: None = None,
+        outencoding: str,
+        **options: Any,  # arbitrary values used by subclasses
+    ) -> None: ...
     def __class_getitem__(cls, name: Any) -> types.GenericAlias: ...
-    def get_style_defs(self, arg: str = ""): ...
-    def format(self, tokensource, outfile): ...
+    def get_style_defs(self, arg: str = "") -> str: ...
+    def format(self, tokensource: Iterable[tuple[_TokenType, str]], outfile: SupportsWrite[_T]) -> None: ...

stubs/Pygments/pygments/formatters/bbcode.pyi

@@ -1,15 +1,14 @@
-from _typeshed import Incomplete
+from _typeshed import SupportsWrite
+from collections.abc import Iterable
 from typing import TypeVar
 
 from pygments.formatter import Formatter
+from pygments.token import _TokenType
 
 _T = TypeVar("_T", str, bytes)
 
 __all__ = ["BBCodeFormatter"]
 
 class BBCodeFormatter(Formatter[_T]):
-    name: str
-    aliases: Incomplete
-    filenames: Incomplete
-    styles: Incomplete
-    def format_unencoded(self, tokensource, outfile) -> None: ...
+    styles: dict[_TokenType, tuple[str, str]]
+    def format_unencoded(self, tokensource: Iterable[tuple[_TokenType, str]], outfile: SupportsWrite[str]) -> None: ...

stubs/Pygments/pygments/formatters/html.pyi

@@ -1,16 +1,15 @@
-from _typeshed import Incomplete
+from _typeshed import Incomplete, SupportsWrite
+from collections.abc import Iterable
 from typing import TypeVar
 
 from pygments.formatter import Formatter
+from pygments.token import _TokenType
 
 _T = TypeVar("_T", str, bytes)
 
 __all__ = ["HtmlFormatter"]
 
 class HtmlFormatter(Formatter[_T]):
-    name: str
-    aliases: Incomplete
-    filenames: Incomplete
     title: Incomplete
     nowrap: Incomplete
     noclasses: Incomplete
@@ -41,4 +40,4 @@ class HtmlFormatter(Formatter[_T]):
     def get_linenos_style_defs(self): ...
     def get_css_prefix(self, arg): ...
     def wrap(self, source): ...
-    def format_unencoded(self, tokensource, outfile) -> None: ...
+    def format_unencoded(self, tokensource: Iterable[tuple[_TokenType, str]], outfile: SupportsWrite[str]) -> None: ...

stubs/Pygments/pygments/formatters/img.pyi

@@ -1,9 +1,9 @@
-from _typeshed import Incomplete
-from typing import TypeVar
+from _typeshed import Incomplete, SupportsWrite
+from collections.abc import Iterable
+from typing_extensions import Never
 
 from pygments.formatter import Formatter
-
-_T = TypeVar("_T", str, bytes)
+from pygments.token import _TokenType
 
 __all__ = ["ImageFormatter", "GifImageFormatter", "JpgImageFormatter", "BmpImageFormatter"]
 
@@ -22,11 +22,7 @@ class FontManager:
     def get_font(self, bold, oblique): ...
     def get_style(self, style): ...
 
-class ImageFormatter(Formatter[_T]):
-    name: str
-    aliases: Incomplete
-    filenames: Incomplete
-    unicodeoutput: bool
+class ImageFormatter(Formatter[bytes]):
     default_image_format: str
     encoding: str
     styles: Incomplete
@@ -49,23 +45,14 @@ class ImageFormatter(Formatter[_T]):
     hl_lines: Incomplete
     hl_color: Incomplete
     drawables: Incomplete
-    def get_style_defs(self, arg: str = "") -> None: ...
-    def format(self, tokensource, outfile) -> None: ...
+    def get_style_defs(self, arg: str = "") -> Never: ...
+    def format(self, tokensource: Iterable[tuple[_TokenType, str]], outfile: SupportsWrite[bytes]) -> None: ...
 
-class GifImageFormatter(ImageFormatter[_T]):
-    name: str
-    aliases: Incomplete
-    filenames: Incomplete
+class GifImageFormatter(ImageFormatter):
     default_image_format: str
 
-class JpgImageFormatter(ImageFormatter[_T]):
-    name: str
-    aliases: Incomplete
-    filenames: Incomplete
+class JpgImageFormatter(ImageFormatter):
     default_image_format: str
 
-class BmpImageFormatter(ImageFormatter[_T]):
-    name: str
-    aliases: Incomplete
-    filenames: Incomplete
+class BmpImageFormatter(ImageFormatter):
     default_image_format: str

stubs/Pygments/pygments/formatters/irc.pyi

@@ -1,17 +1,16 @@
-from _typeshed import Incomplete
+from _typeshed import Incomplete, SupportsWrite
+from collections.abc import Iterable
 from typing import TypeVar
 
 from pygments.formatter import Formatter
+from pygments.token import _TokenType
 
 _T = TypeVar("_T", str, bytes)
 
 __all__ = ["IRCFormatter"]
 
 class IRCFormatter(Formatter[_T]):
-    name: str
-    aliases: Incomplete
-    filenames: Incomplete
     darkbg: Incomplete
     colorscheme: Incomplete
     linenos: Incomplete
-    def format_unencoded(self, tokensource, outfile) -> None: ...
+    def format_unencoded(self, tokensource: Iterable[tuple[_TokenType, str]], outfile: SupportsWrite[str]) -> None: ...

stubs/Pygments/pygments/formatters/latex.pyi

@@ -1,17 +1,16 @@
-from _typeshed import Incomplete
+from _typeshed import Incomplete, SupportsWrite
+from collections.abc import Iterable
 from typing import TypeVar
 
 from pygments.formatter import Formatter
 from pygments.lexer import Lexer
+from pygments.token import _TokenType
 
 _T = TypeVar("_T", str, bytes)
 
 __all__ = ["LatexFormatter"]
 
 class LatexFormatter(Formatter[_T]):
-    name: str
-    aliases: Incomplete
-    filenames: Incomplete
     docclass: Incomplete
     preamble: Incomplete
     linenos: Incomplete
@@ -27,7 +26,7 @@ class LatexFormatter(Formatter[_T]):
     right: Incomplete
     envname: Incomplete
     def get_style_defs(self, arg: str = ""): ...
-    def format_unencoded(self, tokensource, outfile) -> None: ...
+    def format_unencoded(self, tokensource: Iterable[tuple[_TokenType, str]], outfile: SupportsWrite[str]) -> None: ...
 
 class LatexEmbeddedLexer(Lexer):
     left: Incomplete