multi-subclass.patch

 pyproject.toml                         |  2 +-
 src/lxml-stubs/cssselect.pyi           |  9 ++---
 src/lxml-stubs/etree/_element.pyi      | 74 +++++++++++++++++-----------------
 src/lxml-stubs/etree/_factory_func.pyi |  7 ++--
 src/lxml-stubs/html/_element.pyi       | 36 +++++++++++------
 src/lxml-stubs/objectify/_element.pyi  |  9 +++--
 tests/runtime/_testutils/common.py     |  2 +-
 7 files changed, 76 insertions(+), 63 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 518d35f..30f695d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,7 +5,7 @@ requires = ['pdm-backend ~= 2.4']
 build-backend = 'pdm.backend'
 
 [project]
-name = 'types-lxml'
+name = 'types-lxml-multi-subclass'
 dynamic = ['version']
 description = 'Complete lxml external type annotation'
 readme = 'README.md'
diff --git a/src/lxml-stubs/cssselect.pyi b/src/lxml-stubs/cssselect.pyi
index f7aa86f..c084c9f 100644
--- a/src/lxml-stubs/cssselect.pyi
+++ b/src/lxml-stubs/cssselect.pyi
@@ -5,13 +5,12 @@ from cssselect.parser import Function
 from cssselect.xpath import XPathExpr
 
 from ._types import (
-    _ET,
     _CSSTransArg,
     _ElementOrTree,
     _XPathNSArg,
     _XPathVarArg,
 )
-from .etree import XPath
+from .etree import XPath, _Element
 from .html import HtmlElement
 from .objectify import ObjectifiedElement
 
@@ -57,7 +56,7 @@ class CSSSelector(XPath):
     # we handle the 2 built-in element families (HtmlElement
     # and ObjectifiedElement), but the rest is up to users.
     @overload
-    def __call__(
+    def __call__(  # pyright: ignore[reportOverlappingOverload]
         self,
         _etree_or_element: _ElementOrTree[ObjectifiedElement],
         /,
@@ -73,7 +72,7 @@ class CSSSelector(XPath):
     @overload
     def __call__(
         self,
-        _etree_or_element: _ElementOrTree[_ET],
+        _etree_or_element: _ElementOrTree,
         /,
         **_variables: _XPathVarArg,
-    ) -> list[_ET]: ...
+    ) -> list[_Element]: ...
diff --git a/src/lxml-stubs/etree/_element.pyi b/src/lxml-stubs/etree/_element.pyi
index c8e3c32..e4bff8a 100644
--- a/src/lxml-stubs/etree/_element.pyi
+++ b/src/lxml-stubs/etree/_element.pyi
@@ -27,9 +27,9 @@ else:
     from typing_extensions import TypeAlias
 
 if sys.version_info >= (3, 11):
-    from typing import Never, Self
+    from typing import Never
 else:
-    from typing_extensions import Never, Self
+    from typing_extensions import Never
 
 if sys.version_info >= (3, 13):
     from warnings import deprecated
@@ -189,11 +189,11 @@ class _Element:
     #
     def __delitem__(self, __k: int | slice) -> None: ...
     @overload
-    def __getitem__(self, __x: int) -> Self: ...
+    def __getitem__(self, __x: int) -> _Element: ...
     @overload
-    def __getitem__(self, __x: slice) -> list[Self]: ...
+    def __getitem__(self, __x: slice) -> list[_Element]: ...
     @overload
-    def __setitem__(self, __x: int, __v: Self) -> None: ...
+    def __setitem__(self, __x: int, __v: _Element) -> None: ...
     # An element itself can be treated as container of other elements. When used
     # like elem[:] = new_elem, only subelements within new_elem will be
     # inserted, but not new_elem itself. If there is none, the whole slice would
@@ -203,13 +203,13 @@ class _Element:
     # doesn't apply to magic methods, at least for Pylance. Thus we create
     # additional overload for extend() but not here.
     @overload
-    def __setitem__(self, __x: slice, __v: Iterable[Self]) -> None: ...
+    def __setitem__(self, __x: slice, __v: Iterable[_Element]) -> None: ...
     def __contains__(self, __o: object) -> bool: ...
     def __len__(self) -> int: ...
     # There are a hoard of element iterators used in lxml, but
     # they only differ in implementation detail and don't affect typing.
-    def __iter__(self) -> Iterator[Self]: ...
-    def __reversed__(self) -> Iterator[Self]: ...
+    def __iter__(self) -> Iterator[_Element]: ...
+    def __reversed__(self) -> Iterator[_Element]: ...
     def set(self, key: _t._AttrName, value: _t._AttrVal) -> None:
         """Sets an element attribute.
 
@@ -217,7 +217,7 @@ class _Element:
         --------
         - [API Documentation](https://lxml.de/apidoc/lxml.etree.html#lxml.etree._Element.set)
         """
-    def append(self, element: Self) -> None:
+    def append(self, element: _Element) -> None:
         """Adds a subelement to the end of this element.
 
         See Also
@@ -239,7 +239,7 @@ class _Element:
         - [API Documentation](https://lxml.de/apidoc/lxml.etree.html#lxml.etree._Element.extend)
         """
     @overload
-    def extend(self, elements: Iterable[Self]) -> None:
+    def extend(self, elements: Iterable[_Element]) -> None:
         """Extends the current children by the elements in the iterable.
 
         See Also
@@ -253,14 +253,14 @@ class _Element:
         --------
         - [API Documentation](https://lxml.de/apidoc/lxml.etree.html#lxml.etree._Element.clear)
         """
-    def insert(self, index: int, element: Self) -> None:
+    def insert(self, index: int, element: _Element) -> None:
         """Inserts a subelement at the given position in this element
 
         See Also
         --------
         - [API Documentation](https://lxml.de/apidoc/lxml.etree.html#lxml.etree._Element.insert)
         """
-    def remove(self, element: Self) -> None:
+    def remove(self, element: _Element) -> None:
         """Removes a matching subelement.
 
         See Also
@@ -269,7 +269,7 @@ class _Element:
         """
     def index(
         self,
-        child: Self,
+        child: _Element,
         start: int | None = None,
         stop: int | None = None,
     ) -> int:
@@ -327,49 +327,49 @@ class _Element:
     #
     # extra Element / ET methods
     #
-    def addnext(self, element: Self) -> None:
+    def addnext(self, element: _Element) -> None:
         """Adds the element as a following sibling directly after this element.
 
         See Also
         --------
         - [API Documentation](https://lxml.de/apidoc/lxml.etree.html#lxml.etree._Element.addnext)
         """
-    def addprevious(self, element: Self) -> None:
+    def addprevious(self, element: _Element) -> None:
         """Adds the element as a preceding sibling directly before this element.
 
         See Also
         --------
         - [API Documentation](https://lxml.de/apidoc/lxml.etree.html#lxml.etree._Element.addprevious)
         """
-    def replace(self, old_element: Self, new_element: Self) -> None:
+    def replace(self, old_element: _Element, new_element: _Element) -> None:
         """Replaces a subelement with the element passed as second argument.
 
         See Also
         --------
         - [API Documentation](https://lxml.de/apidoc/lxml.etree.html#lxml.etree._Element.replace)
         """
-    def getparent(self) -> Self | None:
+    def getparent(self) -> _Element | None:
         """Returns the parent of this element or None for the root element.
 
         See Also
         --------
         - [API Documentation](https://lxml.de/apidoc/lxml.etree.html#lxml.etree._Element.getparent)
         """
-    def getnext(self) -> Self | None:
+    def getnext(self) -> _Element | None:
         """Returns the following sibling of this element or None.
 
         See Also
         --------
         - [API Documentation](https://lxml.de/apidoc/lxml.etree.html#lxml.etree._Element.getnext)
         """
-    def getprevious(self) -> Self | None:
+    def getprevious(self) -> _Element | None:
         """Returns the preceding sibling of this element or None.
 
         See Also
         --------
         - [API Documentation](https://lxml.de/apidoc/lxml.etree.html#lxml.etree._Element.getprevious)
         """
-    def getroottree(self) -> _ElementTree[Self]:
+    def getroottree(self) -> _ElementTree[_Element]:
         """Return an ElementTree for the root node of the document that
         contains this element.
 
@@ -380,7 +380,7 @@ class _Element:
     @overload
     def itersiblings(
         self, *tags: _t._TagSelector, preceding: bool = False
-    ) -> Iterator[Self]:
+    ) -> Iterator[_Element]:
         """Iterate over the following or preceding siblings of this element.
 
         Annotation
@@ -399,7 +399,7 @@ class _Element:
         tag: _t._TagSelector | Iterable[_t._TagSelector] | None = None,
         *,
         preceding: bool = False,
-    ) -> Iterator[Self]:
+    ) -> Iterator[_Element]:
         """Iterate over the following or preceding siblings of this element.
 
         Annotation
@@ -414,7 +414,7 @@ class _Element:
         - [Possible tag values in `iter()`](https://lxml.de/apidoc/lxml.etree.html#lxml.etree._Element.iter)
         """
     @overload
-    def iterancestors(self, *tags: _t._TagSelector) -> Iterator[Self]:
+    def iterancestors(self, *tags: _t._TagSelector) -> Iterator[_Element]:
         """Iterate over the ancestors of this element (from parent to parent).
 
         Annotation
@@ -430,7 +430,7 @@ class _Element:
     @overload
     def iterancestors(
         self, tag: _t._TagSelector | Iterable[_t._TagSelector] | None = None
-    ) -> Iterator[Self]:
+    ) -> Iterator[_Element]:
         """Iterate over the ancestors of this element (from parent to parent).
 
         Annotation
@@ -445,7 +445,7 @@ class _Element:
         - [Possible tag values in `iter()`](https://lxml.de/apidoc/lxml.etree.html#lxml.etree._Element.iter)
         """
     @overload
-    def iterdescendants(self, *tags: _t._TagSelector) -> Iterator[Self]:
+    def iterdescendants(self, *tags: _t._TagSelector) -> Iterator[_Element]:
         """Iterate over the descendants of this element in document order.
 
         Annotation
@@ -461,7 +461,7 @@ class _Element:
     @overload
     def iterdescendants(
         self, tag: _t._TagSelector | Iterable[_t._TagSelector] | None = None
-    ) -> Iterator[Self]:
+    ) -> Iterator[_Element]:
         """Iterate over the descendants of this element in document order.
 
         Annotation
@@ -478,7 +478,7 @@ class _Element:
     @overload
     def iterchildren(
         self, *tags: _t._TagSelector, reversed: bool = False
-    ) -> Iterator[Self]:
+    ) -> Iterator[_Element]:
         """Iterate over the children of this element.
 
         Annotation
@@ -497,7 +497,7 @@ class _Element:
         tag: _t._TagSelector | Iterable[_t._TagSelector] | None = None,
         *,
         reversed: bool = False,
-    ) -> Iterator[Self]:
+    ) -> Iterator[_Element]:
         """Iterate over the children of this element.
 
         Annotation
@@ -512,7 +512,7 @@ class _Element:
         - [Possible tag values in `iter()`](https://lxml.de/apidoc/lxml.etree.html#lxml.etree._Element.iter)
         """
     @overload
-    def iter(self, *tags: _t._TagSelector) -> Iterator[Self]:
+    def iter(self, *tags: _t._TagSelector) -> Iterator[_Element]:
         """Iterate over all elements in the subtree in document order (depth
         first pre-order), starting with this element.
 
@@ -528,7 +528,7 @@ class _Element:
     @overload
     def iter(
         self, tag: _t._TagSelector | Iterable[_t._TagSelector] | None = None
-    ) -> Iterator[Self]:
+    ) -> Iterator[_Element]:
         """Iterate over all elements in the subtree in document order (depth
         first pre-order), starting with this element.
 
@@ -576,7 +576,7 @@ class _Element:
         - [API Documentation](https://lxml.de/apidoc/lxml.etree.html#lxml.etree._Element.itertext)
         - [Possible tag values in `iter()`](https://lxml.de/apidoc/lxml.etree.html#lxml.etree._Element.iter)
         """
-    makeelement: type[Self]
+    makeelement: type[_Element]
     """Creates a new element associated with the same document.
 
     See Also
@@ -585,7 +585,7 @@ class _Element:
     """
     def find(
         self, path: _t._ElemPathArg, namespaces: _t._StrOnlyNSMap | None = None
-    ) -> Self | None:
+    ) -> _Element | None:
         """Creates a new element associated with the same document.
 
         See Also
@@ -628,7 +628,7 @@ class _Element:
         """
     def findall(
         self, path: _t._ElemPathArg, namespaces: _t._StrOnlyNSMap | None = None
-    ) -> list[Self]:
+    ) -> list[_Element]:
         """Finds all matching subelements, by tag name or path.
 
         See Also
@@ -637,7 +637,7 @@ class _Element:
         """
     def iterfind(
         self, path: _t._ElemPathArg, namespaces: _t._StrOnlyNSMap | None = None
-    ) -> Iterator[Self]:
+    ) -> Iterator[_Element]:
         """Iterates over all matching subelements, by tag name or path.
 
         See Also
@@ -665,7 +665,7 @@ class _Element:
         expr: str,
         *,
         translator: _CSSTransArg = "xml",
-    ) -> list[Self]:
+    ) -> list[_Element]:
         """Run the CSS expression on this element and its children,
         returning a list of the results.
 
@@ -674,13 +674,13 @@ class _Element:
         - [API Documentation](https://lxml.de/apidoc/lxml.etree.html#lxml.etree._Entity.cssselect)
         """
     @deprecated("Since v2.0 (2008); use list(element) or iterate over element")
-    def getchildren(self) -> list[Self]: ...
+    def getchildren(self) -> list[_Element]: ...
     # Should have been overloaded for accuracy, but we can turn a blind eye
     # for something that is marked deprecated for 15 years
     @deprecated("Since v2.0 (2008); renamed to .iter()")
     def getiterator(
         self, tag: _t._TagSelector | None = None, *tags: _t._TagSelector
-    ) -> Iterator[Self]: ...
+    ) -> Iterator[_Element]: ...
 
 Element: TypeAlias = _Element
 
diff --git a/src/lxml-stubs/etree/_factory_func.pyi b/src/lxml-stubs/etree/_factory_func.pyi
index 60f92a4..b670190 100644
--- a/src/lxml-stubs/etree/_factory_func.pyi
+++ b/src/lxml-stubs/etree/_factory_func.pyi
@@ -1,7 +1,6 @@
 from typing import TypeVar, overload
 
 from .._types import (
-    _ET,
     _AttrMapping,
     _AttrVal,
     _NSMapArg,
@@ -10,7 +9,7 @@ from .._types import (
 )
 from ..html import HtmlElement
 from ..objectify import ObjectifiedElement, StringElement
-from ._element import _Comment, _Entity, _ProcessingInstruction
+from ._element import _Comment, _Element, _Entity, _ProcessingInstruction
 
 _T = TypeVar("_T")
 
@@ -57,10 +56,10 @@ def SubElement(
 ) -> HtmlElement: ...
 @overload
 def SubElement(
-    _parent: _ET,
+    _parent: _Element,
     _tag: _TagName,
     /,
     attrib: _AttrMapping | None = None,
     nsmap: _NSMapArg | None = None,
     **_extra: _AttrVal,
-) -> _ET: ...
+) -> _Element: ...
diff --git a/src/lxml-stubs/html/_element.pyi b/src/lxml-stubs/html/_element.pyi
index 9ad3186..56348af 100644
--- a/src/lxml-stubs/html/_element.pyi
+++ b/src/lxml-stubs/html/_element.pyi
@@ -133,7 +133,8 @@ class HtmlElement(etree.ElementBase):
     # Subclassing of _Element should not go beyond HtmlElement. For example,
     # while children of HtmlElement are mostly HtmlElement, FormElement never
     # contains FormElement as child.
-    @overload
+    @overload  # type: ignore[override]
+    # pyrefly: ignore[bad-override]
     def __getitem__(
         self,
         __x: int,
@@ -143,7 +144,8 @@ class HtmlElement(etree.ElementBase):
         self,
         __x: slice,
     ) -> list[HtmlElement]: ...
-    @overload
+    @overload  # type: ignore[override]
+    # pyrefly: ignore[bad-override]
     def __setitem__(
         self,
         __x: int,
@@ -157,12 +159,14 @@ class HtmlElement(etree.ElementBase):
     ) -> None: ...
     def __iter__(self) -> Iterator[HtmlElement]: ...
     def __reversed__(self) -> Iterator[HtmlElement]: ...
+    # pyrefly: ignore[bad-override]
     def append(  # pyright: ignore[reportIncompatibleMethodOverride]  # ty: ignore[invalid-method-override]
         self,
-        element: HtmlElement,
+        element: HtmlElement,  # type: ignore[override]
     ) -> None: ...
     @overload
     @deprecated("Expects iterable of elements as value, not single element")
+    # pyrefly: ignore[bad-override]
     def extend(
         self,
         elements: etree._Element,
@@ -172,33 +176,39 @@ class HtmlElement(etree.ElementBase):
         self,
         elements: Iterable[HtmlElement],
     ) -> None: ...
+    # pyrefly: ignore[bad-override]
     def insert(  # pyright: ignore[reportIncompatibleMethodOverride]  # ty: ignore[invalid-method-override]
         self,
         index: int,
-        element: HtmlElement,
+        element: HtmlElement,  # type: ignore[override]
     ) -> None: ...
+    # pyrefly: ignore[bad-override]
     def remove(  # pyright: ignore[reportIncompatibleMethodOverride]  # ty: ignore[invalid-method-override]
         self,
-        element: HtmlElement,
+        element: HtmlElement,  # type: ignore[override]
     ) -> None: ...
+    # pyrefly: ignore[bad-override]
     def index(  # pyright: ignore[reportIncompatibleMethodOverride]  # ty: ignore[invalid-method-override]
         self,
-        child: HtmlElement,
+        child: HtmlElement,  # type: ignore[override]
         start: int | None = None,
         stop: int | None = None,
     ) -> int: ...
+    # pyrefly: ignore[bad-override]
     def addnext(  # pyright: ignore[reportIncompatibleMethodOverride]  # ty: ignore[invalid-method-override]
         self,
-        element: HtmlElement,
+        element: HtmlElement,  # type: ignore[override]
     ) -> None: ...
+    # pyrefly: ignore[bad-override]
     def addprevious(  # pyright: ignore[reportIncompatibleMethodOverride]  # ty: ignore[invalid-method-override]
         self,
-        element: HtmlElement,
+        element: HtmlElement,  # type: ignore[override]
     ) -> None: ...
+    # pyrefly: ignore[bad-override]
     def replace(  # pyright: ignore[reportIncompatibleMethodOverride]  # ty: ignore[invalid-method-override]
         self,
-        old_element: HtmlElement,
-        new_element: HtmlElement,
+        old_element: HtmlElement,  # type: ignore[override]
+        new_element: HtmlElement,  # type: ignore[override]
     ) -> None: ...
     def getparent(self) -> HtmlElement | None: ...
     def getnext(self) -> HtmlElement | None: ...
@@ -273,13 +283,15 @@ class HtmlElement(etree.ElementBase):
         *,
         with_tail: bool = True,
     ) -> Iterator[str]: ...
+    # pyrefly: ignore[bad-override]
     makeelement: type[HtmlElement]  # pyright: ignore[reportIncompatibleVariableOverride]
     def find(
         self,
         path: _ElemPathArg,
         namespaces: _StrOnlyNSMap | None = None,
     ) -> HtmlElement | None: ...
-    def findall(  # pyright: ignore[reportIncompatibleMethodOverride]  # ty: ignore[invalid-method-override]
+    # pyrefly: ignore[bad-override]
+    def findall(  # type: ignore[override]  # pyright: ignore[reportIncompatibleMethodOverride]  # ty: ignore[invalid-method-override]
         self,
         path: _ElemPathArg,
         namespaces: _StrOnlyNSMap | None = None,
@@ -289,7 +301,7 @@ class HtmlElement(etree.ElementBase):
         path: _ElemPathArg,
         namespaces: _StrOnlyNSMap | None = None,
     ) -> Iterator[HtmlElement]: ...
-    def cssselect(  # pyright: ignore[reportIncompatibleMethodOverride]  # ty: ignore[invalid-method-override]
+    def cssselect(  # type: ignore[override]  # pyright: ignore[reportIncompatibleMethodOverride]  # ty: ignore[invalid-method-override]  # pyrefly: ignore[bad-override]
         self,
         expr: str,
         *,
diff --git a/src/lxml-stubs/objectify/_element.pyi b/src/lxml-stubs/objectify/_element.pyi
index 3175f6d..88df410 100644
--- a/src/lxml-stubs/objectify/_element.pyi
+++ b/src/lxml-stubs/objectify/_element.pyi
@@ -64,7 +64,8 @@ class ObjectifiedElement(ElementBase):
     def addattr(self, tag: _TagName, value: object) -> None: ...
     def countchildren(self) -> int: ...
     def descendantpaths(self, prefix: str | list[str] | None = None) -> list[str]: ...
-    def getchildren(  # pyright: ignore[reportIncompatibleMethodOverride]  # ty: ignore[invalid-method-override]
+      # pyrefly: ignore[bad-override]
+    def getchildren(  # type: ignore[override]  # pyright: ignore[reportIncompatibleMethodOverride]  # ty: ignore[invalid-method-override]
         self,
     ) -> list[ObjectifiedElement]: ...
     def __iter__(self) -> Iterator[ObjectifiedElement]: ...
@@ -75,7 +76,8 @@ class ObjectifiedElement(ElementBase):
     def __delattr__(self, __name: str) -> None: ...
     # elem['foo'] is equivalent to elem.foo, but allows for
     # special attribute names (like 'text' or 'tail')
-    @overload
+    @overload  # type: ignore[override]
+    # pyrefly: ignore[bad-override]
     def __getitem__(self, key: int | str | bytes, /) -> ObjectifiedElement: ...
     @overload
     def __getitem__(  # pyright: ignore[reportIncompatibleMethodOverride]  # ty: ignore[invalid-method-override]
@@ -91,7 +93,8 @@ class ObjectifiedElement(ElementBase):
     # TODO Check if _Element methods need overriding
     # CSS selector is not a normal use case for objectified
     # element (and unnecessary), but still usable nonetheless
-    def cssselect(  # pyright: ignore[reportIncompatibleMethodOverride]  # ty: ignore[invalid-method-override]
+    # pyrefly: ignore[bad-override]
+    def cssselect(  # type: ignore[override]  # pyright: ignore[reportIncompatibleMethodOverride]  # ty: ignore[invalid-method-override]
         self,
         expr: str,
         *,
diff --git a/tests/runtime/_testutils/common.py b/tests/runtime/_testutils/common.py
index 0fcd113..31042c9 100644
--- a/tests/runtime/_testutils/common.py
+++ b/tests/runtime/_testutils/common.py
@@ -20,7 +20,7 @@ else:
     from typing_extensions import Buffer
 
 # Intended for multi subclass patch
-is_multi_subclass_build = False
+is_multi_subclass_build = True
 
 
 class FuncSignatureError(Exception):