From d571f101ba003b3f1645fee452f1597f59b38139 Mon Sep 17 00:00:00 2001 From: Jelle Zijlstra Date: Mon, 22 May 2017 23:12:02 -0700 Subject: [PATCH] fixes to selectors stub (#1304) Make type aliases private; add defaults --- stdlib/3.4/selectors.pyi | 78 ++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/stdlib/3.4/selectors.pyi b/stdlib/3.4/selectors.pyi index 832212b37..547ae0218 100644 --- a/stdlib/3.4/selectors.pyi +++ b/stdlib/3.4/selectors.pyi @@ -9,82 +9,82 @@ import socket # Type aliases added mainly to preserve some context # # See https://github.com/python/typeshed/issues/482 -# for details regarding how FileObject is typed. -FileObject = Union[int, socket.socket] -FileDescriptor = int -EventMask = int +# for details regarding how _FileObject is typed. +_FileObject = Union[int, socket.socket] +_FileDescriptor = int +_EventMask = int -EVENT_READ = ... # type: EventMask -EVENT_WRITE = ... # type: EventMask +EVENT_READ = ... # type: _EventMask +EVENT_WRITE = ... # type: _EventMask SelectorKey = NamedTuple('SelectorKey', [ - ('fileobj', FileObject), - ('fd', FileDescriptor), - ('events', EventMask), + ('fileobj', _FileObject), + ('fd', _FileDescriptor), + ('events', _EventMask), ('data', Any) ]) class BaseSelector(metaclass=ABCMeta): @abstractmethod - def register(self, fileobj: FileObject, events: EventMask, data: Any = None) -> SelectorKey: ... + def register(self, fileobj: _FileObject, events: _EventMask, data: Any = ...) -> SelectorKey: ... @abstractmethod - def unregister(self, fileobj: FileObject) -> SelectorKey: ... + def unregister(self, fileobj: _FileObject) -> SelectorKey: ... - def modify(self, fileobj: FileObject, events: EventMask, data: Any = None) -> SelectorKey: ... + def modify(self, fileobj: _FileObject, events: _EventMask, data: Any = ...) -> SelectorKey: ... @abstractmethod - def select(self, timeout: Optional[int] = None) -> List[Tuple[SelectorKey, EventMask]]: ... + def select(self, timeout: Optional[int] = ...) -> List[Tuple[SelectorKey, _EventMask]]: ... def close(self) -> None: ... - def get_key(self, fileobj: FileObject) -> SelectorKey: ... + def get_key(self, fileobj: _FileObject) -> SelectorKey: ... @abstractmethod - def get_map(self) -> Mapping[FileObject, SelectorKey]: ... + def get_map(self) -> Mapping[_FileObject, SelectorKey]: ... def __enter__(self) -> BaseSelector: ... def __exit__(self, *args: Any) -> None: ... class SelectSelector(BaseSelector): - def register(self, fileobj: FileObject, events: EventMask, data: Any = None) -> SelectorKey: ... - def unregister(self, fileobj: FileObject) -> SelectorKey: ... - def select(self, timeout: Optional[int] = None) -> List[Tuple[SelectorKey, EventMask]]: ... - def get_map(self) -> Mapping[FileObject, SelectorKey]: ... + def register(self, fileobj: _FileObject, events: _EventMask, data: Any = ...) -> SelectorKey: ... + def unregister(self, fileobj: _FileObject) -> SelectorKey: ... + def select(self, timeout: Optional[int] = ...) -> List[Tuple[SelectorKey, _EventMask]]: ... + def get_map(self) -> Mapping[_FileObject, SelectorKey]: ... class PollSelector(BaseSelector): - def register(self, fileobj: FileObject, events: EventMask, data: Any = None) -> SelectorKey: ... - def unregister(self, fileobj: FileObject) -> SelectorKey: ... - def select(self, timeout: Optional[int] = None) -> List[Tuple[SelectorKey, EventMask]]: ... - def get_map(self) -> Mapping[FileObject, SelectorKey]: ... + def register(self, fileobj: _FileObject, events: _EventMask, data: Any = ...) -> SelectorKey: ... + def unregister(self, fileobj: _FileObject) -> SelectorKey: ... + def select(self, timeout: Optional[int] = ...) -> List[Tuple[SelectorKey, _EventMask]]: ... + def get_map(self) -> Mapping[_FileObject, SelectorKey]: ... class EpollSelector(BaseSelector): def fileno(self) -> int: ... - def register(self, fileobj: FileObject, events: EventMask, data: Any = None) -> SelectorKey: ... - def unregister(self, fileobj: FileObject) -> SelectorKey: ... - def select(self, timeout: Optional[int] = None) -> List[Tuple[SelectorKey, EventMask]]: ... - def get_map(self) -> Mapping[FileObject, SelectorKey]: ... + def register(self, fileobj: _FileObject, events: _EventMask, data: Any = ...) -> SelectorKey: ... + def unregister(self, fileobj: _FileObject) -> SelectorKey: ... + def select(self, timeout: Optional[int] = ...) -> List[Tuple[SelectorKey, _EventMask]]: ... + def get_map(self) -> Mapping[_FileObject, SelectorKey]: ... class DevpollSelector(BaseSelector): def fileno(self) -> int: ... - def register(self, fileobj: FileObject, events: EventMask, data: Any = None) -> SelectorKey: ... - def unregister(self, fileobj: FileObject) -> SelectorKey: ... - def select(self, timeout: Optional[int] = None) -> List[Tuple[SelectorKey, EventMask]]: ... - def get_map(self) -> Mapping[FileObject, SelectorKey]: ... + def register(self, fileobj: _FileObject, events: _EventMask, data: Any = ...) -> SelectorKey: ... + def unregister(self, fileobj: _FileObject) -> SelectorKey: ... + def select(self, timeout: Optional[int] = ...) -> List[Tuple[SelectorKey, _EventMask]]: ... + def get_map(self) -> Mapping[_FileObject, SelectorKey]: ... class KqueueSelector(BaseSelector): def fileno(self) -> int: ... - def register(self, fileobj: FileObject, events: EventMask, data: Any = None) -> SelectorKey: ... - def unregister(self, fileobj: FileObject) -> SelectorKey: ... - def select(self, timeout: Optional[int] = None) -> List[Tuple[SelectorKey, EventMask]]: ... - def get_map(self) -> Mapping[FileObject, SelectorKey]: ... + def register(self, fileobj: _FileObject, events: _EventMask, data: Any = ...) -> SelectorKey: ... + def unregister(self, fileobj: _FileObject) -> SelectorKey: ... + def select(self, timeout: Optional[int] = ...) -> List[Tuple[SelectorKey, _EventMask]]: ... + def get_map(self) -> Mapping[_FileObject, SelectorKey]: ... class DefaultSelector(BaseSelector): - def register(self, fileobj: FileObject, events: EventMask, data: Any = None) -> SelectorKey: ... - def unregister(self, fileobj: FileObject) -> SelectorKey: ... - def select(self, timeout: Optional[int] = None) -> List[Tuple[SelectorKey, EventMask]]: ... - def get_map(self) -> Mapping[FileObject, SelectorKey]: ... + def register(self, fileobj: _FileObject, events: _EventMask, data: Any = ...) -> SelectorKey: ... + def unregister(self, fileobj: _FileObject) -> SelectorKey: ... + def select(self, timeout: Optional[int] = ...) -> List[Tuple[SelectorKey, _EventMask]]: ... + def get_map(self) -> Mapping[_FileObject, SelectorKey]: ...