More PR comments

python · AlexWaygood · Feb 21, 2024 · Dec 1, 2022 · Dec 1, 2022 · Dec 1, 2022
commit a4ee82cb58153d10458b998e9ccdd7d988761744
diff --git a/stubs/bleach/bleach/html5lib_shim.pyi b/stubs/bleach/bleach/html5lib_shim.pyi
@@ -1,7 +1,7 @@
 import re
 from codecs import CodecInfo
 from collections.abc import Collection, Generator, Iterable, Iterator
-from typing import Any
+from typing import Any, Protocol
 
 # We don't re-export any `html5lib` types / values here, because they are not
 # really public and may change at any time. This is just a helper module,
@@ -14,7 +14,7 @@ from html5lib.serializer import HTMLSerializer
 from html5lib.treewalkers.base import TreeWalker
 
 # Is actually webencodings.Encoding
-class _Encoding:
+class _Encoding(Protocol):
     name: str
     codec_info: CodecInfo
     def __init__(self, name: str, codec_info: CodecInfo) -> None: ...
@@ -31,7 +31,7 @@ TAG_TOKEN_TYPE_PARSEERROR: int
 TAG_TOKEN_TYPE_START: int
 
 class InputStreamWithMemory:
-    position: int
+    position = HTMLUnicodeInputStream.position
     def __init__(self, inner_stream: HTMLUnicodeInputStream) -> None: ...
     def reset(self) -> None: ...
     @property

diff --git a/stubs/bleach/bleach/linkifier.pyi b/stubs/bleach/bleach/linkifier.pyi
@@ -53,7 +53,7 @@ class LinkifyFilter(Filter):
         url_re: Pattern[str] = ...,
         email_re: Pattern[str] = ...,
     ) -> None: ...
-    def apply_callbacks(self, attrs: _HTMLAttrs, is_new: bool) -> _HTMLAttrs: ...
+    def apply_callbacks(self, attrs: _HTMLAttrs, is_new: bool) -> _HTMLAttrs | None: ...
     def extract_character_data(self, token_list: Iterable[_Token]) -> str: ...
     def handle_email_addresses(self, src_iter: Iterable[_Token]) -> Iterator[_Token]: ...
     def strip_non_url_bits(self, fragment: str) -> tuple[str, str, str]: ...

diff --git a/stubs/html5lib/html5lib/_inputstream.pyi b/stubs/html5lib/html5lib/_inputstream.pyi
@@ -1,10 +1,10 @@
 from _typeshed import Incomplete, SupportsRead
 from codecs import CodecInfo
-from typing import Any, overload
+from typing import Any, Protocol, overload
 from typing_extensions import TypeAlias
 
 # Is actually webencodings.Encoding
-class _Encoding:
+class _Encoding(Protocol):
     name: str
     codec_info: CodecInfo
     def __init__(self, name: str, codec_info: CodecInfo) -> None: ...