diff --git a/stdlib/2.7/socket.pyi b/stdlib/2.7/socket.pyi index 807c0f1c4..93864c303 100644 --- a/stdlib/2.7/socket.pyi +++ b/stdlib/2.7/socket.pyi @@ -6,7 +6,7 @@ # see: http://nullege.com/codes/search/socket # adapted for Python 2.7 by Michal Pokorny -from typing import Any, Tuple, overload, List, Optional, Union +from typing import Any, Tuple, List, Optional, Union, overload # ----- variables and constants ----- @@ -283,24 +283,10 @@ class socket: # --- methods --- # second tuple item is an address def accept(self) -> Tuple['socket', Any]: ... - - @overload - def bind(self, address: tuple) -> None: ... - @overload - def bind(self, address: str) -> None: ... - + def bind(self, address: Union[tuple, str]) -> None: ... def close(self) -> None: ... - - @overload - def connect(self, address: tuple) -> None: ... - @overload - def connect(self, address: str) -> None: ... - - @overload - def connect_ex(self, address: tuple) -> int: ... - @overload - def connect_ex(self, address: str) -> int: ... - + def connect(self, address: Union[tuple, str]) -> None: ... + def connect_ex(self, address: Union[tuple, str]) -> int: ... def detach(self) -> int: ... def fileno(self) -> int: ... @@ -309,9 +295,9 @@ class socket: def getsockname(self) -> Any: ... @overload - def getsockopt(self, level: int, optname: str) -> str: ... + def getsockopt(self, level: int, optname: str) -> int: ... @overload - def getsockopt(self, level: int, optname: str, buflen: int) -> str: ... + def getsockopt(self, level: int, optname: str, buflen: int) -> bytes: ... def gettimeout(self) -> float: ... def ioctl(self, control: object, @@ -333,21 +319,10 @@ class socket: def send(self, data: str, flags=...) -> int: ... def sendall(self, data: str, flags=...) -> Any: ... # return type: None on success - - @overload - def sendto(self, data: str, address: tuple, flags: int = ...) -> int: ... - @overload - def sendto(self, data: str, address: str, flags: int = ...) -> int: ... - + def sendto(self, data: str, address: Union[tuple, str], flags: int = ...) -> int: ... def setblocking(self, flag: bool) -> None: ... - # TODO None valid for the value argument - def settimeout(self, value: float) -> None: ... - - @overload - def setsockopt(self, level: int, optname: str, value: int) -> None: ... - @overload - def setsockopt(self, level: int, optname: str, value: str) -> None: ... - + def settimeout(self, value: Union[float, None]) -> None: ... + def setsockopt(self, level: int, optname: str, value: Union[int, str]) -> None: ... def shutdown(self, how: int) -> None: ... @@ -383,6 +358,5 @@ def inet_aton(ip_string: str) -> str: ... # ret val 4 bytes in length def inet_ntoa(packed_ip: str) -> str: ... def inet_pton(address_family: int, ip_string: str) -> str: ... def inet_ntop(address_family: int, packed_ip: str) -> str: ... -# TODO the timeout may be None -def getdefaulttimeout() -> float: ... +def getdefaulttimeout() -> Union[float, None]: ... def setdefaulttimeout(timeout: float) -> None: ... diff --git a/stdlib/3/socket.pyi b/stdlib/3/socket.pyi index d2f3c9716..dba7b526f 100644 --- a/stdlib/3/socket.pyi +++ b/stdlib/3/socket.pyi @@ -5,7 +5,7 @@ # see: http://hg.python.org/cpython/file/3d0686d90f55/Lib/socket.py # see: http://nullege.com/codes/search/socket -from typing import Any, Tuple, overload, List +from typing import Any, Tuple, Union, List, overload # ----- variables and constants ----- @@ -282,24 +282,10 @@ class socket: # --- methods --- # second tuple item is an address def accept(self) -> Tuple['socket', Any]: ... - - @overload - def bind(self, address: tuple) -> None: ... - @overload - def bind(self, address: str) -> None: ... - + def bind(self, address: Union[tuple, str]) -> None: ... def close(self) -> None: ... - - @overload - def connect(self, address: tuple) -> None: ... - @overload - def connect(self, address: str) -> None: ... - - @overload - def connect_ex(self, address: tuple) -> int: ... - @overload - def connect_ex(self, address: str) -> int: ... - + def connect(self, address: Union[tuple, str]) -> None: ... + def connect_ex(self, address: Union[tuple, str]) -> int: ... def detach(self) -> int: ... def fileno(self) -> int: ... @@ -308,7 +294,7 @@ class socket: def getsockname(self) -> Any: ... @overload - def getsockopt(self, level: int, optname: str) -> bytes: ... + def getsockopt(self, level: int, optname: str) -> int: ... @overload def getsockopt(self, level: int, optname: str, buflen: int) -> bytes: ... @@ -332,21 +318,10 @@ class socket: def send(self, data: bytes, flags=...) -> int: ... def sendall(self, data: bytes, flags=...) -> Any: ... # return type: None on success - - @overload - def sendto(self, data: bytes, address: tuple, flags: int = ...) -> int: ... - @overload - def sendto(self, data: bytes, address: str, flags: int = ...) -> int: ... - + def sendto(self, data: bytes, address: Union[tuple, str], flags: int = ...) -> int: ... def setblocking(self, flag: bool) -> None: ... - # TODO None valid for the value argument - def settimeout(self, value: float) -> None: ... - - @overload - def setsockopt(self, level: int, optname: str, value: int) -> None: ... - @overload - def setsockopt(self, level: int, optname: str, value: bytes) -> None: ... - + def settimeout(self, value: Union[float, None]) -> None: ... + def setsockopt(self, level: int, optname: str, value: Union[int, bytes]) -> None: ... def shutdown(self, how: int) -> None: ... @@ -382,6 +357,5 @@ def inet_aton(ip_string: str) -> bytes: ... # ret val 4 bytes in length def inet_ntoa(packed_ip: bytes) -> str: ... def inet_pton(address_family: int, ip_string: str) -> bytes: ... def inet_ntop(address_family: int, packed_ip: bytes) -> str: ... -# TODO the timeout may be None -def getdefaulttimeout() -> float: ... +def getdefaulttimeout() -> Union[float, None]: ... def setdefaulttimeout(timeout: float) -> None: ...