From 65d4d042a1e8ac3ee1420ee3c81465be3745558e Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Tue, 4 Jan 2022 19:56:08 +0000 Subject: [PATCH 01/31] Add return types for format/highlight. --- stubs/Pygments/pygments/__init__.pyi | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/stubs/Pygments/pygments/__init__.pyi b/stubs/Pygments/pygments/__init__.pyi index 1b05e273a1d3..d720cdc607bc 100644 --- a/stubs/Pygments/pygments/__init__.pyi +++ b/stubs/Pygments/pygments/__init__.pyi @@ -1,5 +1,13 @@ from typing import Any def lex(code, lexer): ... -def format(tokens, formatter, outfile: Any | None = ...): ... -def highlight(code, lexer, formatter, outfile: Any | None = ...): ... + +@overload +def format(tokens, formatter, outfile: FileIO) -> None: ... +@overload +def format(tokens, formatter, outfile: None = ...) -> str: ... + +@overload +def highlight(code, lexer, formatter, outfile: FileIO) -> None: ... +@overload +def highlight(code, lexer, formatter, outfile: None = ...) -> str: ... From 243abca8cbd5ea476073e95f3559ff52374d265f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 4 Jan 2022 19:57:23 +0000 Subject: [PATCH 02/31] [pre-commit.ci] auto fixes from pre-commit.com hooks --- stubs/Pygments/pygments/__init__.pyi | 2 -- 1 file changed, 2 deletions(-) diff --git a/stubs/Pygments/pygments/__init__.pyi b/stubs/Pygments/pygments/__init__.pyi index d720cdc607bc..c1baf7c78e32 100644 --- a/stubs/Pygments/pygments/__init__.pyi +++ b/stubs/Pygments/pygments/__init__.pyi @@ -1,12 +1,10 @@ from typing import Any def lex(code, lexer): ... - @overload def format(tokens, formatter, outfile: FileIO) -> None: ... @overload def format(tokens, formatter, outfile: None = ...) -> str: ... - @overload def highlight(code, lexer, formatter, outfile: FileIO) -> None: ... @overload From ad64fc07948dad0ab058bc1aa63da5b34a482ecd Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Tue, 4 Jan 2022 20:51:41 +0000 Subject: [PATCH 03/31] Update __init__.pyi --- stubs/Pygments/pygments/__init__.pyi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stubs/Pygments/pygments/__init__.pyi b/stubs/Pygments/pygments/__init__.pyi index c1baf7c78e32..9f4cfa362445 100644 --- a/stubs/Pygments/pygments/__init__.pyi +++ b/stubs/Pygments/pygments/__init__.pyi @@ -1,4 +1,5 @@ -from typing import Any +from io import FileIO +from typing import Any, overload def lex(code, lexer): ... @overload From 34d4f1e25acfa71e0055b6f0fa07210434278ed4 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Tue, 4 Jan 2022 20:56:22 +0000 Subject: [PATCH 04/31] Update __init__.pyi --- stubs/Pygments/pygments/__init__.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/Pygments/pygments/__init__.pyi b/stubs/Pygments/pygments/__init__.pyi index 9f4cfa362445..31219819aced 100644 --- a/stubs/Pygments/pygments/__init__.pyi +++ b/stubs/Pygments/pygments/__init__.pyi @@ -1,5 +1,5 @@ from io import FileIO -from typing import Any, overload +from typing import overload def lex(code, lexer): ... @overload From 2febfaf4c7b17a2c4cefac42a18214d355a261d2 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Wed, 5 Jan 2022 17:28:46 +0000 Subject: [PATCH 05/31] Make formatter generic --- stubs/Pygments/pygments/formatter.pyi | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/stubs/Pygments/pygments/formatter.pyi b/stubs/Pygments/pygments/formatter.pyi index 1fbf82f19956..ac93c4adbe61 100644 --- a/stubs/Pygments/pygments/formatter.pyi +++ b/stubs/Pygments/pygments/formatter.pyi @@ -1,6 +1,8 @@ -from typing import Any +from typing import Any, Generic, TypeVar -class Formatter: +_T = TypeVar("_T", str, bytes) + +class Formatter(Generic[_T]): name: Any aliases: Any filenames: Any @@ -10,6 +12,11 @@ class Formatter: title: Any encoding: Any options: Any - def __init__(self, **options) -> None: ... + @overload + def __init__(self: Formatter[str], *, encoding: None = ..., **options) -> None: ... + @overload + def __init__(self: Formatter[bytes], *, encoding: str, **options) -> None: ... + @overload + def __init__(self: Formatter[bytes], *, outencoding: str, **options) -> None: ... def get_style_defs(self, arg: str = ...): ... def format(self, tokensource, outfile): ... From 3d86e088772e827e87b6e33c546e8dc269b9f26d Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Wed, 5 Jan 2022 17:31:57 +0000 Subject: [PATCH 06/31] Update __init__.pyi --- stubs/Pygments/pygments/__init__.pyi | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/stubs/Pygments/pygments/__init__.pyi b/stubs/Pygments/pygments/__init__.pyi index 31219819aced..a6a07664ac32 100644 --- a/stubs/Pygments/pygments/__init__.pyi +++ b/stubs/Pygments/pygments/__init__.pyi @@ -1,11 +1,15 @@ from io import FileIO -from typing import overload +from typing import TypeVar, overload + +from pygments.formatters import Formatter + +_T = TypeVar("_T") def lex(code, lexer): ... @overload -def format(tokens, formatter, outfile: FileIO) -> None: ... +def format(tokens, formatter: Formatter, outfile: FileIO) -> None: ... @overload -def format(tokens, formatter, outfile: None = ...) -> str: ... +def format(tokens, formatter: Formatter[_T], outfile: None = ...) -> _T: ... @overload def highlight(code, lexer, formatter, outfile: FileIO) -> None: ... @overload From a81755157e7e55a8494320d8e07aee987dfc5d65 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Wed, 5 Jan 2022 17:38:22 +0000 Subject: [PATCH 07/31] Update formatter.pyi --- stubs/Pygments/pygments/formatter.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/Pygments/pygments/formatter.pyi b/stubs/Pygments/pygments/formatter.pyi index ac93c4adbe61..f9f2db35cbf9 100644 --- a/stubs/Pygments/pygments/formatter.pyi +++ b/stubs/Pygments/pygments/formatter.pyi @@ -1,4 +1,4 @@ -from typing import Any, Generic, TypeVar +from typing import Any, Generic, TypeVar, overload _T = TypeVar("_T", str, bytes) From 316a5e1af2fe1c87b81515b508b06ffccfbfc366 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Wed, 5 Jan 2022 17:39:04 +0000 Subject: [PATCH 08/31] Update __init__.pyi --- stubs/Pygments/pygments/__init__.pyi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stubs/Pygments/pygments/__init__.pyi b/stubs/Pygments/pygments/__init__.pyi index a6a07664ac32..40921429ea74 100644 --- a/stubs/Pygments/pygments/__init__.pyi +++ b/stubs/Pygments/pygments/__init__.pyi @@ -1,13 +1,13 @@ from io import FileIO -from typing import TypeVar, overload +from typing import Any, TypeVar, overload from pygments.formatters import Formatter -_T = TypeVar("_T") +_T = TypeVar("_T", str, bytes) def lex(code, lexer): ... @overload -def format(tokens, formatter: Formatter, outfile: FileIO) -> None: ... +def format(tokens, formatter: Formatter[Any], outfile: FileIO) -> None: ... @overload def format(tokens, formatter: Formatter[_T], outfile: None = ...) -> _T: ... @overload From 0b0efbe02b19688d11f1ff2085f28794ea3f8f2c Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Wed, 5 Jan 2022 17:41:43 +0000 Subject: [PATCH 09/31] Update plugin.pyi --- stubs/Pygments/pygments/plugin.pyi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stubs/Pygments/pygments/plugin.pyi b/stubs/Pygments/pygments/plugin.pyi index d500b8fcf5eb..81e3554c082c 100644 --- a/stubs/Pygments/pygments/plugin.pyi +++ b/stubs/Pygments/pygments/plugin.pyi @@ -1,4 +1,4 @@ -from typing import Generator, Iterable +from typing import Any, Generator, Iterable from pkg_resources import EntryPoint from pygments.filter import Filter @@ -13,6 +13,6 @@ FILTER_ENTRY_POINT: str def iter_entry_points(group_name: str) -> Iterable[EntryPoint]: ... def find_plugin_lexers() -> Generator[type[Lexer], None, None]: ... -def find_plugin_formatters() -> Generator[tuple[str, type[Formatter]], None, None]: ... +def find_plugin_formatters() -> Generator[tuple[str, type[Formatter[Any]]], None, None]: ... def find_plugin_styles() -> Generator[tuple[str, type[Style]], None, None]: ... def find_plugin_filters() -> Generator[tuple[str, type[Filter]], None, None]: ... From c17d0329e4a4feb4c1a3f064845f87e6f3337567 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Wed, 5 Jan 2022 17:42:14 +0000 Subject: [PATCH 10/31] Update __init__.pyi --- stubs/Pygments/pygments/formatters/__init__.pyi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stubs/Pygments/pygments/formatters/__init__.pyi b/stubs/Pygments/pygments/formatters/__init__.pyi index b77043bb31e1..8d811645e39e 100644 --- a/stubs/Pygments/pygments/formatters/__init__.pyi +++ b/stubs/Pygments/pygments/formatters/__init__.pyi @@ -1,4 +1,4 @@ -from typing import Generator, Type +from typing import Any, Generator, Type from ..formatter import Formatter from .bbcode import BBCodeFormatter as BBCodeFormatter @@ -18,7 +18,7 @@ from .svg import SvgFormatter as SvgFormatter from .terminal import TerminalFormatter as TerminalFormatter from .terminal256 import Terminal256Formatter as Terminal256Formatter, TerminalTrueColorFormatter as TerminalTrueColorFormatter -def get_all_formatters() -> Generator[Type[Formatter], None, None]: ... +def get_all_formatters() -> Generator[Type[Formatter[Any]], None, None]: ... def get_formatter_by_name(_alias, **options): ... def load_formatter_from_file(filename, formattername: str = ..., **options): ... def get_formatter_for_filename(fn, **options): ... From 8a8a6d99f95483038fd9257af6995fb2f4e59045 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Wed, 5 Jan 2022 17:49:19 +0000 Subject: [PATCH 11/31] Update bbcode.pyi --- stubs/Pygments/pygments/formatters/bbcode.pyi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/stubs/Pygments/pygments/formatters/bbcode.pyi b/stubs/Pygments/pygments/formatters/bbcode.pyi index 332c6c13a0bd..64aeb0c0d1b5 100644 --- a/stubs/Pygments/pygments/formatters/bbcode.pyi +++ b/stubs/Pygments/pygments/formatters/bbcode.pyi @@ -1,8 +1,10 @@ -from typing import Any +from typing import Any, TypeVar from pygments.formatter import Formatter -class BBCodeFormatter(Formatter): +_T = TypeVar("_T", str, bytes) + +class BBCodeFormatter(Formatter[_T]): name: str aliases: Any filenames: Any From 617943e44c8b1ee5158081857030a101dcc732df Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Wed, 5 Jan 2022 17:50:35 +0000 Subject: [PATCH 12/31] Update html.pyi --- stubs/Pygments/pygments/formatters/html.pyi | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/stubs/Pygments/pygments/formatters/html.pyi b/stubs/Pygments/pygments/formatters/html.pyi index ba3d0696d853..1822dec0efaa 100644 --- a/stubs/Pygments/pygments/formatters/html.pyi +++ b/stubs/Pygments/pygments/formatters/html.pyi @@ -1,8 +1,10 @@ -from typing import Any +from typing import Any, TypeVar from pygments.formatter import Formatter -class HtmlFormatter(Formatter): +_T = TypeVar("_T", str, bytes) + +class HtmlFormatter(Formatter[_T]): name: str aliases: Any filenames: Any @@ -30,7 +32,6 @@ class HtmlFormatter(Formatter): linespans: Any anchorlinenos: Any hl_lines: Any - def __init__(self, **options) -> None: ... def get_style_defs(self, arg: Any | None = ...): ... def get_token_style_defs(self, arg: Any | None = ...): ... def get_background_style_defs(self, arg: Any | None = ...): ... From d9923369f5ba911fa547df3a9abc692a9f9a30d6 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Wed, 5 Jan 2022 17:51:28 +0000 Subject: [PATCH 13/31] Update img.pyi --- stubs/Pygments/pygments/formatters/img.pyi | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/stubs/Pygments/pygments/formatters/img.pyi b/stubs/Pygments/pygments/formatters/img.pyi index 06b50aee8ca4..255dc80fdf38 100644 --- a/stubs/Pygments/pygments/formatters/img.pyi +++ b/stubs/Pygments/pygments/formatters/img.pyi @@ -1,7 +1,9 @@ -from typing import Any +from typing import Any, TypeVar from pygments.formatter import Formatter +_T = TypeVar("_T", str, bytes) + class PilNotAvailable(ImportError): ... class FontNotFound(Exception): ... @@ -15,7 +17,7 @@ class FontManager: def get_text_size(self, text): ... def get_font(self, bold, oblique): ... -class ImageFormatter(Formatter): +class ImageFormatter(Formatter[_T]): name: str aliases: Any filenames: Any @@ -42,23 +44,22 @@ class ImageFormatter(Formatter): hl_lines: Any hl_color: Any drawables: Any - def __init__(self, **options) -> None: ... def get_style_defs(self, arg: str = ...) -> None: ... def format(self, tokensource, outfile) -> None: ... -class GifImageFormatter(ImageFormatter): +class GifImageFormatter(ImageFormatter[_T]): name: str aliases: Any filenames: Any default_image_format: str -class JpgImageFormatter(ImageFormatter): +class JpgImageFormatter(ImageFormatter[_T]): name: str aliases: Any filenames: Any default_image_format: str -class BmpImageFormatter(ImageFormatter): +class BmpImageFormatter(ImageFormatter[_T]): name: str aliases: Any filenames: Any From ce3bcc01a8f2f0f20fbc7d0d8b848bcfb0255664 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Wed, 5 Jan 2022 17:52:01 +0000 Subject: [PATCH 14/31] Update irc.pyi --- stubs/Pygments/pygments/formatters/irc.pyi | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/stubs/Pygments/pygments/formatters/irc.pyi b/stubs/Pygments/pygments/formatters/irc.pyi index b8bedfd849ac..7af728d1445c 100644 --- a/stubs/Pygments/pygments/formatters/irc.pyi +++ b/stubs/Pygments/pygments/formatters/irc.pyi @@ -1,13 +1,14 @@ -from typing import Any +from typing import Any, TypeVar from pygments.formatter import Formatter -class IRCFormatter(Formatter): +_T = TypeVar("_T", str, bytes) + +class IRCFormatter(Formatter[_T]): name: str aliases: Any filenames: Any darkbg: Any colorscheme: Any linenos: Any - def __init__(self, **options) -> None: ... def format_unencoded(self, tokensource, outfile) -> None: ... From 66dae1df0ba4477873400cd48a661d0546d25ffd Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Wed, 5 Jan 2022 17:52:33 +0000 Subject: [PATCH 15/31] Update latex.pyi --- stubs/Pygments/pygments/formatters/latex.pyi | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/stubs/Pygments/pygments/formatters/latex.pyi b/stubs/Pygments/pygments/formatters/latex.pyi index a321c7b1ada0..83147436e7e6 100644 --- a/stubs/Pygments/pygments/formatters/latex.pyi +++ b/stubs/Pygments/pygments/formatters/latex.pyi @@ -1,9 +1,11 @@ -from typing import Any +from typing import Any, TypeVar from pygments.formatter import Formatter from pygments.lexer import Lexer -class LatexFormatter(Formatter): +_T = TypeVar("_T", str, bytes) + +class LatexFormatter(Formatter[_T]): name: str aliases: Any filenames: Any @@ -21,7 +23,6 @@ class LatexFormatter(Formatter): left: Any right: Any envname: Any - def __init__(self, **options) -> None: ... def get_style_defs(self, arg: str = ...): ... def format_unencoded(self, tokensource, outfile) -> None: ... From 6d98106bf6e544ce2e8605956ff0846b6acc2cff Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Wed, 5 Jan 2022 17:53:16 +0000 Subject: [PATCH 16/31] Update other.pyi --- stubs/Pygments/pygments/formatters/other.pyi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/stubs/Pygments/pygments/formatters/other.pyi b/stubs/Pygments/pygments/formatters/other.pyi index 222ab054b96f..e02007b00c03 100644 --- a/stubs/Pygments/pygments/formatters/other.pyi +++ b/stubs/Pygments/pygments/formatters/other.pyi @@ -1,14 +1,16 @@ -from typing import Any +from typing import Any, TypeVar from pygments.formatter import Formatter -class NullFormatter(Formatter): +_T = TypeVar("_T", str, bytes) + +class NullFormatter(Formatter[_T]): name: str aliases: Any filenames: Any def format(self, tokensource, outfile) -> None: ... -class RawTokenFormatter(Formatter): +class RawTokenFormatter(Formatter[_T]): name: str aliases: Any filenames: Any @@ -16,11 +18,9 @@ class RawTokenFormatter(Formatter): encoding: str compress: Any error_color: Any - def __init__(self, **options) -> None: ... def format(self, tokensource, outfile) -> None: ... -class TestcaseFormatter(Formatter): +class TestcaseFormatter(Formatter[_T]): name: str aliases: Any - def __init__(self, **options) -> None: ... def format(self, tokensource, outfile) -> None: ... From 780d5e9dd64f03bad3006354dc83822a0f2b19e6 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Wed, 5 Jan 2022 17:53:41 +0000 Subject: [PATCH 17/31] Update pangomarkup.pyi --- stubs/Pygments/pygments/formatters/pangomarkup.pyi | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/stubs/Pygments/pygments/formatters/pangomarkup.pyi b/stubs/Pygments/pygments/formatters/pangomarkup.pyi index c72b9fd84a63..d266bbe3f295 100644 --- a/stubs/Pygments/pygments/formatters/pangomarkup.pyi +++ b/stubs/Pygments/pygments/formatters/pangomarkup.pyi @@ -1,11 +1,12 @@ -from typing import Any +from typing import Any, TypeVar from pygments.formatter import Formatter -class PangoMarkupFormatter(Formatter): +_T = TypeVar("_T", str, bytes) + +class PangoMarkupFormatter(Formatter[_T]): name: str aliases: Any filenames: Any styles: Any - def __init__(self, **options) -> None: ... def format_unencoded(self, tokensource, outfile) -> None: ... From bd1e9cb213a8ddafb6610712faad9739d1e4226e Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Wed, 5 Jan 2022 17:54:06 +0000 Subject: [PATCH 18/31] Update rtf.pyi --- stubs/Pygments/pygments/formatters/rtf.pyi | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/stubs/Pygments/pygments/formatters/rtf.pyi b/stubs/Pygments/pygments/formatters/rtf.pyi index 2dcffc66952d..900f43d6f38b 100644 --- a/stubs/Pygments/pygments/formatters/rtf.pyi +++ b/stubs/Pygments/pygments/formatters/rtf.pyi @@ -1,12 +1,13 @@ -from typing import Any +from typing import Any, TypeVar from pygments.formatter import Formatter -class RtfFormatter(Formatter): +_T = TypeVar("_T", str, bytes) + +class RtfFormatter(Formatter[_T]): name: str aliases: Any filenames: Any fontface: Any fontsize: Any - def __init__(self, **options) -> None: ... def format_unencoded(self, tokensource, outfile) -> None: ... From b58b7fe55e0717f99467c30a3d4a55934dd01577 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Wed, 5 Jan 2022 17:54:34 +0000 Subject: [PATCH 19/31] Update svg.pyi --- stubs/Pygments/pygments/formatters/svg.pyi | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/stubs/Pygments/pygments/formatters/svg.pyi b/stubs/Pygments/pygments/formatters/svg.pyi index 8dd0402595d1..f349157c0cc5 100644 --- a/stubs/Pygments/pygments/formatters/svg.pyi +++ b/stubs/Pygments/pygments/formatters/svg.pyi @@ -1,8 +1,10 @@ -from typing import Any +from typing import Any, TypeVar from pygments.formatter import Formatter -class SvgFormatter(Formatter): +_T = TypeVar("_T", str, bytes) + +class SvgFormatter(Formatter[_T]): name: str aliases: Any filenames: Any @@ -17,5 +19,4 @@ class SvgFormatter(Formatter): linenostart: Any linenostep: Any linenowidth: Any - def __init__(self, **options) -> None: ... def format_unencoded(self, tokensource, outfile) -> None: ... From 972a67195888a92e233149766a68a1f495aa77d3 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Wed, 5 Jan 2022 17:55:01 +0000 Subject: [PATCH 20/31] Update terminal.pyi --- stubs/Pygments/pygments/formatters/terminal.pyi | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/stubs/Pygments/pygments/formatters/terminal.pyi b/stubs/Pygments/pygments/formatters/terminal.pyi index 92b2c8b4ee91..7448f17a695d 100644 --- a/stubs/Pygments/pygments/formatters/terminal.pyi +++ b/stubs/Pygments/pygments/formatters/terminal.pyi @@ -1,14 +1,15 @@ -from typing import Any +from typing import Any, TypeVar from pygments.formatter import Formatter -class TerminalFormatter(Formatter): +_T = TypeVar("_T", str, bytes) + +class TerminalFormatter(Formatter[_T]): name: str aliases: Any filenames: Any darkbg: Any colorscheme: Any linenos: Any - def __init__(self, **options) -> None: ... def format(self, tokensource, outfile): ... def format_unencoded(self, tokensource, outfile) -> None: ... From 6e283211474e0ca6c25402c21ba464e1ec7d8186 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Wed, 5 Jan 2022 17:55:36 +0000 Subject: [PATCH 21/31] Update terminal256.pyi --- stubs/Pygments/pygments/formatters/terminal256.pyi | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/stubs/Pygments/pygments/formatters/terminal256.pyi b/stubs/Pygments/pygments/formatters/terminal256.pyi index 55786c45dc9b..69f30cc1929a 100644 --- a/stubs/Pygments/pygments/formatters/terminal256.pyi +++ b/stubs/Pygments/pygments/formatters/terminal256.pyi @@ -1,7 +1,9 @@ -from typing import Any +from typing import Any, TypeVar from pygments.formatter import Formatter +_T = TypeVar("_T", str, bytes) + class EscapeSequence: fg: Any bg: Any @@ -16,7 +18,7 @@ class EscapeSequence: def true_color_string(self): ... def reset_string(self): ... -class Terminal256Formatter(Formatter): +class Terminal256Formatter(Formatter[_T]): name: str aliases: Any filenames: Any @@ -27,11 +29,10 @@ class Terminal256Formatter(Formatter): useunderline: Any useitalic: Any linenos: Any - def __init__(self, **options) -> None: ... def format(self, tokensource, outfile): ... def format_unencoded(self, tokensource, outfile) -> None: ... -class TerminalTrueColorFormatter(Terminal256Formatter): +class TerminalTrueColorFormatter(Terminal256Formatter[_T]): name: str aliases: Any filenames: Any From 772ea1fa8f08ef7bff4d776b4dde518dca3e0267 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Wed, 5 Jan 2022 17:57:15 +0000 Subject: [PATCH 22/31] Update bbcode.pyi --- stubs/Pygments/pygments/formatters/bbcode.pyi | 1 - 1 file changed, 1 deletion(-) diff --git a/stubs/Pygments/pygments/formatters/bbcode.pyi b/stubs/Pygments/pygments/formatters/bbcode.pyi index 64aeb0c0d1b5..df1708bec27a 100644 --- a/stubs/Pygments/pygments/formatters/bbcode.pyi +++ b/stubs/Pygments/pygments/formatters/bbcode.pyi @@ -9,5 +9,4 @@ class BBCodeFormatter(Formatter[_T]): aliases: Any filenames: Any styles: Any - def __init__(self, **options) -> None: ... def format_unencoded(self, tokensource, outfile) -> None: ... From dd2c3ffdf45151dd41ae37797f6afae1398a46d0 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Thu, 6 Jan 2022 17:44:36 +0000 Subject: [PATCH 23/31] Update stubs/Pygments/pygments/formatter.pyi Co-authored-by: Akuli --- stubs/Pygments/pygments/formatter.pyi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stubs/Pygments/pygments/formatter.pyi b/stubs/Pygments/pygments/formatter.pyi index f9f2db35cbf9..f441d487cf6b 100644 --- a/stubs/Pygments/pygments/formatter.pyi +++ b/stubs/Pygments/pygments/formatter.pyi @@ -13,10 +13,10 @@ class Formatter(Generic[_T]): encoding: Any options: Any @overload - def __init__(self: Formatter[str], *, encoding: None = ..., **options) -> None: ... + def __init__(self: Formatter[str], *, encoding: None = ..., outencoding: None = ..., **options) -> None: ... @overload - def __init__(self: Formatter[bytes], *, encoding: str, **options) -> None: ... + def __init__(self: Formatter[bytes], *, encoding: str, outencoding: None = ..., **options) -> None: ... @overload - def __init__(self: Formatter[bytes], *, outencoding: str, **options) -> None: ... + def __init__(self: Formatter[bytes], *, encoding: None = ..., outencoding: str, **options) -> None: ... def get_style_defs(self, arg: str = ...): ... def format(self, tokensource, outfile): ... From 3ac61af891ba645de4eb15b834376d5bb498cf77 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Thu, 6 Jan 2022 17:46:44 +0000 Subject: [PATCH 24/31] Update __init__.pyi --- stubs/Pygments/pygments/__init__.pyi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stubs/Pygments/pygments/__init__.pyi b/stubs/Pygments/pygments/__init__.pyi index 40921429ea74..5061d6cc28d1 100644 --- a/stubs/Pygments/pygments/__init__.pyi +++ b/stubs/Pygments/pygments/__init__.pyi @@ -1,5 +1,5 @@ -from io import FileIO from typing import Any, TypeVar, overload +from _typeshed import SupportsWrite from pygments.formatters import Formatter @@ -7,10 +7,10 @@ _T = TypeVar("_T", str, bytes) def lex(code, lexer): ... @overload -def format(tokens, formatter: Formatter[Any], outfile: FileIO) -> None: ... +def format(tokens, formatter: Formatter[Any], outfile: SupportsWrite) -> None: ... @overload def format(tokens, formatter: Formatter[_T], outfile: None = ...) -> _T: ... @overload -def highlight(code, lexer, formatter, outfile: FileIO) -> None: ... +def highlight(code, lexer, formatter, outfile: SupportsWrite) -> None: ... @overload def highlight(code, lexer, formatter, outfile: None = ...) -> str: ... From 2c617b8cd4f906c4a77c0310b6b6559f2c0f35d7 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 6 Jan 2022 17:47:51 +0000 Subject: [PATCH 25/31] [pre-commit.ci] auto fixes from pre-commit.com hooks --- stubs/Pygments/pygments/__init__.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/Pygments/pygments/__init__.pyi b/stubs/Pygments/pygments/__init__.pyi index 5061d6cc28d1..4d040c5fe38b 100644 --- a/stubs/Pygments/pygments/__init__.pyi +++ b/stubs/Pygments/pygments/__init__.pyi @@ -1,5 +1,5 @@ -from typing import Any, TypeVar, overload from _typeshed import SupportsWrite +from typing import Any, TypeVar, overload from pygments.formatters import Formatter From 0630cc4ce33101868745ac6a9c256bd13804953c Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Thu, 6 Jan 2022 17:57:39 +0000 Subject: [PATCH 26/31] Update __init__.pyi --- stubs/Pygments/pygments/__init__.pyi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stubs/Pygments/pygments/__init__.pyi b/stubs/Pygments/pygments/__init__.pyi index 4d040c5fe38b..1661f4526c84 100644 --- a/stubs/Pygments/pygments/__init__.pyi +++ b/stubs/Pygments/pygments/__init__.pyi @@ -7,10 +7,10 @@ _T = TypeVar("_T", str, bytes) def lex(code, lexer): ... @overload -def format(tokens, formatter: Formatter[Any], outfile: SupportsWrite) -> None: ... +def format(tokens, formatter: Formatter[Any], outfile: SupportsWrite[Any]) -> None: ... @overload def format(tokens, formatter: Formatter[_T], outfile: None = ...) -> _T: ... @overload -def highlight(code, lexer, formatter, outfile: SupportsWrite) -> None: ... +def highlight(code, lexer, formatter, outfile: SupportsWrite[Any]) -> None: ... @overload def highlight(code, lexer, formatter, outfile: None = ...) -> str: ... From 25c992e706469889e0083454f2f67530088342dd Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Thu, 6 Jan 2022 18:10:33 +0000 Subject: [PATCH 27/31] Update __init__.pyi --- stubs/Pygments/pygments/__init__.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/Pygments/pygments/__init__.pyi b/stubs/Pygments/pygments/__init__.pyi index 1661f4526c84..5998b0a7bea5 100644 --- a/stubs/Pygments/pygments/__init__.pyi +++ b/stubs/Pygments/pygments/__init__.pyi @@ -1,7 +1,7 @@ from _typeshed import SupportsWrite from typing import Any, TypeVar, overload -from pygments.formatters import Formatter +from .formatters import Formatter _T = TypeVar("_T", str, bytes) From 0a2c798465614831d96fd30d2fafd1cb3fd50182 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Thu, 6 Jan 2022 21:58:44 +0000 Subject: [PATCH 28/31] Update stubs/Pygments/pygments/__init__.pyi Co-authored-by: Akuli --- stubs/Pygments/pygments/__init__.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/Pygments/pygments/__init__.pyi b/stubs/Pygments/pygments/__init__.pyi index 5998b0a7bea5..2024028ba6da 100644 --- a/stubs/Pygments/pygments/__init__.pyi +++ b/stubs/Pygments/pygments/__init__.pyi @@ -7,7 +7,7 @@ _T = TypeVar("_T", str, bytes) def lex(code, lexer): ... @overload -def format(tokens, formatter: Formatter[Any], outfile: SupportsWrite[Any]) -> None: ... +def format(tokens, formatter: Formatter[_T], outfile: SupportsWrite[_T]) -> None: ... @overload def format(tokens, formatter: Formatter[_T], outfile: None = ...) -> _T: ... @overload From 82eeb4efe8c648581e1e4156f61847c4d6d65bd0 Mon Sep 17 00:00:00 2001 From: Akuli Date: Fri, 7 Jan 2022 00:39:32 +0200 Subject: [PATCH 29/31] Update stubs/Pygments/pygments/__init__.pyi Co-authored-by: Sam Bull --- stubs/Pygments/pygments/__init__.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/Pygments/pygments/__init__.pyi b/stubs/Pygments/pygments/__init__.pyi index 2024028ba6da..712fa12015fb 100644 --- a/stubs/Pygments/pygments/__init__.pyi +++ b/stubs/Pygments/pygments/__init__.pyi @@ -1,7 +1,7 @@ from _typeshed import SupportsWrite from typing import Any, TypeVar, overload -from .formatters import Formatter +from .formatter import Formatter _T = TypeVar("_T", str, bytes) From 785104c18084fcccc316a38103e17cb7815d9a07 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Sat, 8 Jan 2022 18:13:40 +0000 Subject: [PATCH 30/31] Update __init__.pyi --- stubs/Pygments/pygments/__init__.pyi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stubs/Pygments/pygments/__init__.pyi b/stubs/Pygments/pygments/__init__.pyi index 712fa12015fb..5d3f62c35f3a 100644 --- a/stubs/Pygments/pygments/__init__.pyi +++ b/stubs/Pygments/pygments/__init__.pyi @@ -1,7 +1,7 @@ from _typeshed import SupportsWrite from typing import Any, TypeVar, overload -from .formatter import Formatter +from pygments.formatter import Formatter _T = TypeVar("_T", str, bytes) @@ -11,6 +11,6 @@ def format(tokens, formatter: Formatter[_T], outfile: SupportsWrite[_T]) -> None @overload def format(tokens, formatter: Formatter[_T], outfile: None = ...) -> _T: ... @overload -def highlight(code, lexer, formatter, outfile: SupportsWrite[Any]) -> None: ... +def highlight(code, lexer, formatter: Formatter[_T], outfile: SupportsWrite[_T]) -> None: ... @overload -def highlight(code, lexer, formatter, outfile: None = ...) -> str: ... +def highlight(code, lexer, formatter: Formatter[_T], outfile: None = ...) -> _T: ... From 3292cd8db83c07a66ad30c1c17376d045a075c57 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Sat, 8 Jan 2022 18:14:56 +0000 Subject: [PATCH 31/31] Update __init__.pyi --- stubs/Pygments/pygments/__init__.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/Pygments/pygments/__init__.pyi b/stubs/Pygments/pygments/__init__.pyi index 5d3f62c35f3a..7a9621cf9b7f 100644 --- a/stubs/Pygments/pygments/__init__.pyi +++ b/stubs/Pygments/pygments/__init__.pyi @@ -1,5 +1,5 @@ from _typeshed import SupportsWrite -from typing import Any, TypeVar, overload +from typing import TypeVar, overload from pygments.formatter import Formatter