From 5638d29203c0cc3ada62093bf1e9f18aced65ba6 Mon Sep 17 00:00:00 2001 From: Niels Buwen Date: Fri, 16 Aug 2019 17:08:23 +0200 Subject: [PATCH] Fix #3187 : Wrong Signatures in socketserver (#3189) Fixes #3187 --- stdlib/2/SocketServer.pyi | 8 ++++---- stdlib/3/socketserver.pyi | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/stdlib/2/SocketServer.pyi b/stdlib/2/SocketServer.pyi index d485b8bf1..22dda28b4 100644 --- a/stdlib/2/SocketServer.pyi +++ b/stdlib/2/SocketServer.pyi @@ -1,7 +1,7 @@ # NB: SocketServer.pyi and socketserver.pyi must remain consistent! # Stubs for socketserver -from typing import Any, BinaryIO, Optional, Tuple, Type +from typing import Any, BinaryIO, Optional, Tuple, Type, Text, Union from socket import SocketType import sys import types @@ -15,7 +15,7 @@ class BaseServer: request_queue_size: int socket_type: int timeout: Optional[float] - def __init__(self, server_address: Tuple[str, int], + def __init__(self, server_address: Any, RequestHandlerClass: type) -> None: ... def fileno(self) -> int: ... def handle_request(self) -> None: ... @@ -54,12 +54,12 @@ class UDPServer(BaseServer): if sys.platform != 'win32': class UnixStreamServer(BaseServer): - def __init__(self, server_address: Tuple[str, int], + def __init__(self, server_address: Union[Text, bytes], RequestHandlerClass: type, bind_and_activate: bool = ...) -> None: ... class UnixDatagramServer(BaseServer): - def __init__(self, server_address: Tuple[str, int], + def __init__(self, server_address: Union[Text, bytes], RequestHandlerClass: type, bind_and_activate: bool = ...) -> None: ... diff --git a/stdlib/3/socketserver.pyi b/stdlib/3/socketserver.pyi index d485b8bf1..22dda28b4 100644 --- a/stdlib/3/socketserver.pyi +++ b/stdlib/3/socketserver.pyi @@ -1,7 +1,7 @@ # NB: SocketServer.pyi and socketserver.pyi must remain consistent! # Stubs for socketserver -from typing import Any, BinaryIO, Optional, Tuple, Type +from typing import Any, BinaryIO, Optional, Tuple, Type, Text, Union from socket import SocketType import sys import types @@ -15,7 +15,7 @@ class BaseServer: request_queue_size: int socket_type: int timeout: Optional[float] - def __init__(self, server_address: Tuple[str, int], + def __init__(self, server_address: Any, RequestHandlerClass: type) -> None: ... def fileno(self) -> int: ... def handle_request(self) -> None: ... @@ -54,12 +54,12 @@ class UDPServer(BaseServer): if sys.platform != 'win32': class UnixStreamServer(BaseServer): - def __init__(self, server_address: Tuple[str, int], + def __init__(self, server_address: Union[Text, bytes], RequestHandlerClass: type, bind_and_activate: bool = ...) -> None: ... class UnixDatagramServer(BaseServer): - def __init__(self, server_address: Tuple[str, int], + def __init__(self, server_address: Union[Text, bytes], RequestHandlerClass: type, bind_and_activate: bool = ...) -> None: ...