diff --git a/stubs/python-xlib/Xlib/_typing.pyi b/stubs/python-xlib/Xlib/_typing.pyi index ff7016194..550da8afd 100644 --- a/stubs/python-xlib/Xlib/_typing.pyi +++ b/stubs/python-xlib/Xlib/_typing.pyi @@ -7,4 +7,3 @@ from Xlib.protocol.rq import Request _T = TypeVar("_T") ErrorHandler: TypeAlias = Callable[[XError, Request | None], _T] -Unused: TypeAlias = object diff --git a/stubs/python-xlib/Xlib/ext/composite.pyi b/stubs/python-xlib/Xlib/ext/composite.pyi index b300955e5..3d647de0f 100644 --- a/stubs/python-xlib/Xlib/ext/composite.pyi +++ b/stubs/python-xlib/Xlib/ext/composite.pyi @@ -1,8 +1,9 @@ +from _typeshed import Unused from collections.abc import Callable from typing import Any, Final from typing_extensions import TypeAlias -from Xlib._typing import ErrorHandler, Unused +from Xlib._typing import ErrorHandler from Xlib.display import Display from Xlib.protocol import rq from Xlib.xobject import drawable, resource diff --git a/stubs/python-xlib/Xlib/ext/dpms.pyi b/stubs/python-xlib/Xlib/ext/dpms.pyi index d6193dc1b..1319a5c88 100644 --- a/stubs/python-xlib/Xlib/ext/dpms.pyi +++ b/stubs/python-xlib/Xlib/ext/dpms.pyi @@ -1,6 +1,6 @@ +from _typeshed import Unused from typing import Final, Literal -from Xlib._typing import Unused from Xlib.display import Display from Xlib.protocol import rq from Xlib.xobject import resource diff --git a/stubs/python-xlib/Xlib/ext/ge.pyi b/stubs/python-xlib/Xlib/ext/ge.pyi index ced9463ed..1689e2af6 100644 --- a/stubs/python-xlib/Xlib/ext/ge.pyi +++ b/stubs/python-xlib/Xlib/ext/ge.pyi @@ -1,6 +1,6 @@ +from _typeshed import Unused from typing import Final -from Xlib._typing import Unused from Xlib.display import Display from Xlib.protocol import rq from Xlib.xobject import resource diff --git a/stubs/python-xlib/Xlib/ext/nvcontrol.pyi b/stubs/python-xlib/Xlib/ext/nvcontrol.pyi index 711a21c6e..e8087a1ee 100644 --- a/stubs/python-xlib/Xlib/ext/nvcontrol.pyi +++ b/stubs/python-xlib/Xlib/ext/nvcontrol.pyi @@ -1,6 +1,6 @@ +from _typeshed import Unused from typing import Final -from Xlib._typing import Unused from Xlib.display import Display from Xlib.protocol import rq from Xlib.xobject import resource diff --git a/stubs/python-xlib/Xlib/ext/record.pyi b/stubs/python-xlib/Xlib/ext/record.pyi index 51bcf5284..4cac2039e 100644 --- a/stubs/python-xlib/Xlib/ext/record.pyi +++ b/stubs/python-xlib/Xlib/ext/record.pyi @@ -1,7 +1,7 @@ +from _typeshed import Unused from collections.abc import Callable, Sequence, Sized from typing import Any, Final, Literal, TypeVar -from Xlib._typing import Unused from Xlib.display import Display from Xlib.protocol import display, rq from Xlib.xobject import resource diff --git a/stubs/python-xlib/Xlib/ext/res.pyi b/stubs/python-xlib/Xlib/ext/res.pyi index ba613b524..27df70378 100644 --- a/stubs/python-xlib/Xlib/ext/res.pyi +++ b/stubs/python-xlib/Xlib/ext/res.pyi @@ -1,7 +1,7 @@ +from _typeshed import Unused from collections.abc import Sequence from typing import Final -from Xlib._typing import Unused from Xlib.display import Display from Xlib.protocol import rq from Xlib.xobject import resource diff --git a/stubs/python-xlib/Xlib/ext/security.pyi b/stubs/python-xlib/Xlib/ext/security.pyi index 21e336d7d..b8445fe24 100644 --- a/stubs/python-xlib/Xlib/ext/security.pyi +++ b/stubs/python-xlib/Xlib/ext/security.pyi @@ -1,6 +1,6 @@ +from _typeshed import Unused from typing import Final -from Xlib._typing import Unused from Xlib.display import Display from Xlib.protocol import rq from Xlib.xobject import resource diff --git a/stubs/python-xlib/Xlib/ext/xfixes.pyi b/stubs/python-xlib/Xlib/ext/xfixes.pyi index 23afba7f5..cb9bdc42c 100644 --- a/stubs/python-xlib/Xlib/ext/xfixes.pyi +++ b/stubs/python-xlib/Xlib/ext/xfixes.pyi @@ -1,6 +1,6 @@ +from _typeshed import Unused from typing import Final -from Xlib._typing import Unused from Xlib.display import Display from Xlib.protocol import request, rq from Xlib.xobject import drawable, resource diff --git a/stubs/python-xlib/Xlib/ext/xinerama.pyi b/stubs/python-xlib/Xlib/ext/xinerama.pyi index 86954f2ad..e47a080ac 100644 --- a/stubs/python-xlib/Xlib/ext/xinerama.pyi +++ b/stubs/python-xlib/Xlib/ext/xinerama.pyi @@ -1,6 +1,6 @@ +from _typeshed import Unused from typing import Final -from Xlib._typing import Unused from Xlib.display import Display from Xlib.protocol import rq from Xlib.xobject import drawable, resource diff --git a/stubs/python-xlib/Xlib/ext/xinput.pyi b/stubs/python-xlib/Xlib/ext/xinput.pyi index d562359fd..6711faef3 100644 --- a/stubs/python-xlib/Xlib/ext/xinput.pyi +++ b/stubs/python-xlib/Xlib/ext/xinput.pyi @@ -1,8 +1,7 @@ -from _typeshed import ConvertibleToFloat, SliceableBuffer +from _typeshed import ConvertibleToFloat, SliceableBuffer, Unused from collections.abc import Iterable, Sequence from typing import Final, TypeVar -from Xlib._typing import Unused from Xlib.display import Display from Xlib.protocol import display, request, rq from Xlib.xobject import drawable, resource diff --git a/stubs/python-xlib/Xlib/ext/xtest.pyi b/stubs/python-xlib/Xlib/ext/xtest.pyi index 4da281cdd..5734b7195 100644 --- a/stubs/python-xlib/Xlib/ext/xtest.pyi +++ b/stubs/python-xlib/Xlib/ext/xtest.pyi @@ -1,6 +1,6 @@ +from _typeshed import Unused from typing import Final -from Xlib._typing import Unused from Xlib.display import Display from Xlib.protocol import rq from Xlib.xobject import resource diff --git a/stubs/python-xlib/Xlib/protocol/rq.pyi b/stubs/python-xlib/Xlib/protocol/rq.pyi index e56cabd68..b429499d3 100644 --- a/stubs/python-xlib/Xlib/protocol/rq.pyi +++ b/stubs/python-xlib/Xlib/protocol/rq.pyi @@ -1,4 +1,4 @@ -from _typeshed import ConvertibleToInt, SliceableBuffer +from _typeshed import ConvertibleToInt, SliceableBuffer, Unused from array import array # Avoid name collision with List.type @@ -7,7 +7,7 @@ from collections.abc import Callable, Iterable, Sequence from typing import Any, Final, Literal, SupportsIndex, TypeVar, overload, type_check_only from typing_extensions import LiteralString, TypeAlias -from Xlib._typing import ErrorHandler, Unused +from Xlib._typing import ErrorHandler from Xlib.display import _BaseDisplay, _ResourceBaseClass from Xlib.error import XError from Xlib.ext.xinput import ClassInfoClass diff --git a/stubs/python-xlib/Xlib/support/unix_connect.pyi b/stubs/python-xlib/Xlib/support/unix_connect.pyi index f9b91ab85..600d3daa7 100644 --- a/stubs/python-xlib/Xlib/support/unix_connect.pyi +++ b/stubs/python-xlib/Xlib/support/unix_connect.pyi @@ -1,13 +1,12 @@ import sys from _socket import _Address +from _typeshed import Unused from platform import uname_result from re import Pattern from socket import socket from typing import Final, Literal from typing_extensions import TypeAlias -from Xlib._typing import Unused - if sys.platform == "darwin": SUPPORTED_PROTOCOLS: Final[tuple[None, Literal["tcp"], Literal["unix"], Literal["darwin"]]] _Protocol: TypeAlias = Literal["tcp", "unix", "darwin"] | None diff --git a/stubs/python-xlib/Xlib/support/vms_connect.pyi b/stubs/python-xlib/Xlib/support/vms_connect.pyi index adbb6f484..f812f2be8 100644 --- a/stubs/python-xlib/Xlib/support/vms_connect.pyi +++ b/stubs/python-xlib/Xlib/support/vms_connect.pyi @@ -1,10 +1,9 @@ from _socket import _Address +from _typeshed import Unused from re import Pattern from socket import socket from typing import Final -from Xlib._typing import Unused - display_re: Final[Pattern[str]] def get_display(display: str | None) -> tuple[str, None, str, int, int]: ...