Address review comments

Co-authored-by: Sebastian Rittau <srittau@rittau.biz>

Author: brianschubert

stubs/Pygments/pygments/__init__.pyi

@@ -1,5 +1,5 @@
 from _typeshed import SupportsWrite
-from collections.abc import Iterator
+from collections.abc import Iterable, Iterator
 from typing import Final, TypeVar, overload
 
 from pygments.formatter import Formatter
@@ -14,9 +14,9 @@ __all__ = ["lex", "format", "highlight"]
 
 def lex(code: str, lexer: Lexer) -> Iterator[tuple[_TokenType, str]]: ...
 @overload
-def format(tokens: Iterator[tuple[_TokenType, str]], formatter: Formatter[_T], outfile: SupportsWrite[_T]) -> None: ...
+def format(tokens: Iterable[tuple[_TokenType, str]], formatter: Formatter[_T], outfile: SupportsWrite[_T]) -> None: ...
 @overload
-def format(tokens: Iterator[tuple[_TokenType, str]], formatter: Formatter[_T], outfile: None = None) -> _T: ...
+def format(tokens: Iterable[tuple[_TokenType, str]], formatter: Formatter[_T], outfile: None = None) -> _T: ...
 @overload
 def highlight(code: str, lexer: Lexer, formatter: Formatter[_T], outfile: SupportsWrite[_T]) -> None: ...
 @overload

stubs/Pygments/pygments/util.pyi

@@ -1,7 +1,7 @@
-from collections.abc import Callable, Container, Hashable, Iterable, Mapping
+from collections.abc import Callable, Container, Hashable, Iterable
 from io import TextIOWrapper
 from re import Pattern
-from typing import Any, Final, TextIO, TypeVar
+from typing import Any, Final, Protocol, TypeVar, type_check_only
 
 _T = TypeVar("_T")
 _H = TypeVar("_H", bound=Hashable)
@@ -14,16 +14,22 @@ xml_decl_re: Final[Pattern[str]]
 class ClassNotFound(ValueError): ...
 class OptionError(Exception): ...
 
+@type_check_only
+class _SupportsGetStrWithDefault(Protocol):
+    def get(self, item: str, default: Any, /) -> Any: ...
+
 # 'options' contains the **kwargs of an arbitrary function.
 def get_choice_opt(
-    options: Mapping[str, Any], optname: str, allowed: Container[_T], default: _T | None = None, normcase: bool = False
+    options: _SupportsGetStrWithDefault, optname: str, allowed: Container[_T], default: _T | None = None, normcase: bool = False
 ) -> _T: ...
-def get_bool_opt(options: Mapping[str, Any], optname: str, default: bool | None = None) -> bool: ...
-def get_int_opt(options: Mapping[str, Any], optname: str, default: int | None = None) -> int: ...
+def get_bool_opt(options: _SupportsGetStrWithDefault, optname: str, default: bool | None = None) -> bool: ...
+def get_int_opt(options: _SupportsGetStrWithDefault, optname: str, default: int | None = None) -> int: ...
 
 # Return type and type of 'default' depend on the signature of the function whose **kwargs
 # are being processed.
-def get_list_opt(options: Mapping[str, Any], optname: str, default: list[Any] | tuple[Any, ...] | None = None) -> list[Any]: ...
+def get_list_opt(
+    options: _SupportsGetStrWithDefault, optname: str, default: list[Any] | tuple[Any, ...] | None = None
+) -> list[Any]: ...
 def docstring_headline(obj: object) -> str: ...
 def make_analysator(f: Callable[[str], float]) -> Callable[[str], float]: ...
 def shebang_matches(text: str, regex: str) -> bool: ...
@@ -38,8 +44,10 @@ class Future:
     def get(self) -> None: ...
 
 def guess_decode(text: bytes) -> tuple[str, str]: ...
-def guess_decode_from_terminal(text: bytes, term: TextIO) -> tuple[str, str]: ...
-def terminal_encoding(term: TextIO) -> str: ...
+
+# If 'term' has an 'encoding' attribute, it should be a str. Otherwise any object is accepted.
+def guess_decode_from_terminal(text: bytes, term: Any) -> tuple[str, str]: ...
+def terminal_encoding(term: Any) -> str: ...
 
 class UnclosingTextIOWrapper(TextIOWrapper):
     def close(self) -> None: ...