Use typing_extensions.Self instead of _typeshed.Self (#9702)

stubs/caldav/caldav/davclient.pyi

@@ -1,7 +1,6 @@
-from _typeshed import Self
 from collections.abc import Iterable, Mapping
 from typing import Any
-from typing_extensions import TypeAlias
+from typing_extensions import Self, TypeAlias
 from urllib.parse import ParseResult, SplitResult
 
 from requests.auth import AuthBase
@@ -50,7 +49,7 @@ class DAVClient:
         ssl_verify_cert: bool | str = ...,
         ssl_cert: str | tuple[str, str] | None = ...,
     ) -> None: ...
-    def __enter__(self: Self) -> Self: ...
+    def __enter__(self) -> Self: ...
     def __exit__(self, exc_type: object, exc_value: object, traceback: object) -> None: ...
     def principal(self, *, url: str | ParseResult | SplitResult | URL | None = ...) -> Principal: ...
     def calendar(

stubs/caldav/caldav/elements/base.pyi

@@ -1,7 +1,7 @@
-from _typeshed import Incomplete, Self
+from _typeshed import Incomplete
 from collections.abc import Iterable
 from typing import Any, ClassVar
-from typing_extensions import TypeAlias
+from typing_extensions import Self, TypeAlias
 
 _Element: TypeAlias = Any  # actually lxml.etree._Element
 
@@ -12,10 +12,10 @@ class BaseElement:
     attributes: Incomplete | None
     caldav_class: Incomplete | None
     def __init__(self, name: str | None = ..., value: str | bytes | None = ...) -> None: ...
-    def __add__(self: Self, other: BaseElement) -> Self: ...
+    def __add__(self, other: BaseElement) -> Self: ...
     def xmlelement(self) -> _Element: ...
     def xmlchildren(self, root: _Element) -> None: ...
-    def append(self: Self, element: BaseElement | Iterable[BaseElement]) -> Self: ...
+    def append(self, element: BaseElement | Iterable[BaseElement]) -> Self: ...
 
 class NamedBaseElement(BaseElement):
     def __init__(self, name: str | None = ...) -> None: ...

stubs/caldav/caldav/objects.pyi

@@ -1,8 +1,8 @@
 import datetime
-from _typeshed import Incomplete, Self
+from _typeshed import Incomplete
 from collections.abc import Iterable, Iterator, Mapping, Sequence
 from typing import Any, TypeVar, overload
-from typing_extensions import Literal, TypeAlias
+from typing_extensions import Literal, Self, TypeAlias
 from urllib.parse import ParseResult, SplitResult
 
 from vobject.base import VBase
@@ -41,8 +41,8 @@ class DAVObject:
     def get_properties(
         self, props: Incomplete | None = ..., depth: int = ..., parse_response_xml: bool = ..., parse_props: bool = ...
     ): ...
-    def set_properties(self: Self, props: Incomplete | None = ...) -> Self: ...
-    def save(self: Self) -> Self: ...
+    def set_properties(self, props: Incomplete | None = ...) -> Self: ...
+    def save(self) -> Self: ...
     def delete(self) -> None: ...
 
 class CalendarSet(DAVObject):
@@ -208,18 +208,18 @@ class CalendarObjectResource(DAVObject):
         props: Incomplete | None = ...,
     ) -> None: ...
     def add_organizer(self) -> None: ...
-    def split_expanded(self: Self) -> list[Self]: ...
+    def split_expanded(self) -> list[Self]: ...
     def expand_rrule(self, start: datetime.datetime, end: datetime.datetime) -> None: ...
     def add_attendee(self, attendee, no_default_parameters: bool = ..., **parameters) -> None: ...
     def is_invite_request(self) -> bool: ...
     def accept_invite(self, calendar: Incomplete | None = ...) -> None: ...
     def decline_invite(self, calendar: Incomplete | None = ...) -> None: ...
     def tentatively_accept_invite(self, calendar: Incomplete | None = ...) -> None: ...
-    def copy(self: Self, keep_uid: bool = ..., new_parent: Incomplete | None = ...) -> Self: ...
-    def load(self: Self) -> Self: ...
+    def copy(self, keep_uid: bool = ..., new_parent: Incomplete | None = ...) -> Self: ...
+    def load(self) -> Self: ...
     def change_attendee_status(self, attendee: Incomplete | None = ..., **kwargs) -> None: ...
     def save(
-        self: Self,
+        self,
         no_overwrite: bool = ...,
         no_create: bool = ...,
         obj_type: str | None = ...,