From f7b35bc8bef2847b1846742fdee341a79fd34491 Mon Sep 17 00:00:00 2001 From: alvarocaceres Date: Fri, 22 Jul 2016 12:55:42 -0500 Subject: [PATCH] Remove line continuations to help pytype parse (#390) --- stdlib/2.7/ssl.pyi | 9 +++------ stdlib/2and3/argparse.pyi | 3 +-- stdlib/2and3/logging/__init__.pyi | 6 ++---- stdlib/2and3/logging/config.pyi | 3 +-- stdlib/2and3/logging/handlers.pyi | 3 +-- stdlib/2and3/zipfile.pyi | 3 +-- tests/pytype_blacklist.txt | 6 ++---- 7 files changed, 11 insertions(+), 22 deletions(-) diff --git a/stdlib/2.7/ssl.pyi b/stdlib/2.7/ssl.pyi index abbba9b54..1225d9a0a 100644 --- a/stdlib/2.7/ssl.pyi +++ b/stdlib/2.7/ssl.pyi @@ -164,18 +164,15 @@ class SSLContext: def load_default_certs(self, purpose: _PurposeType = ...) -> None: ... def load_verify_locations(self, cafile: Optional[str] = ..., capath: Optional[str] = ..., - cadata: Union[str, bytes, None] = ...) \ - -> None: ... + cadata: Union[str, bytes, None] = ...) -> None: ... def get_ca_certs(self, - binary_form: bool = ...) \ - -> Union[List[_PeerCertRetDictType], List[bytes]]: ... + binary_form: bool = ...) -> Union[List[_PeerCertRetDictType], List[bytes]]: ... def set_default_verify_paths(self) -> None: ... def set_ciphers(self, ciphers: str) -> None: ... def set_alpn_protocols(protocols: List[str]) -> None: ... def set_npn_protocols(protocols: List[str]) -> None: ... def set_servername_callback(self, - server_name_callback: Optional[_SrvnmeCbType]) \ - -> None: ... + server_name_callback: Optional[_SrvnmeCbType]) -> None: ... def load_dh_params(self, dhfile: str) -> None: ... def set_ecdh_curve(self, curve_name: str) -> None: ... def wrap_socket(self, sock: socket.socket, server_side: bool = ..., diff --git a/stdlib/2and3/argparse.pyi b/stdlib/2and3/argparse.pyi index da1f6fd35..eb379d404 100644 --- a/stdlib/2and3/argparse.pyi +++ b/stdlib/2and3/argparse.pyi @@ -80,8 +80,7 @@ class ArgumentParser: def format_usage(self) -> str: ... def format_help(self) -> str: ... def parse_known_args(self, args: Optional[str] = ..., - namespace: Optional[Namespace] = ...) \ - -> Tuple[Namespace, List[str]]: ... + namespace: Optional[Namespace] = ...) -> Tuple[Namespace, List[str]]: ... def convert_arg_line_to_args(self, arg_line: str) -> List[str]: ... def exit(self, status: int = ..., message: Optional[str] = ...) -> None: ... def error(self, message: str) -> None: ... diff --git a/stdlib/2and3/logging/__init__.pyi b/stdlib/2and3/logging/__init__.pyi index acc51a720..8afe6c3af 100644 --- a/stdlib/2and3/logging/__init__.pyi +++ b/stdlib/2and3/logging/__init__.pyi @@ -80,8 +80,7 @@ class Logger: def addHandler(self, hdlr: 'Handler') -> None: ... def removeHandler(self, hdlr: 'Handler') -> None: ... if sys.version_info >= (3,): - def findCaller(self, stack_info: bool = ...) \ - -> Tuple[str, int, str, Optional[str]]: ... + def findCaller(self, stack_info: bool = ...) -> Tuple[str, int, str, Optional[str]]: ... else: def findCaller(self # type: ignore ) -> Tuple[str, int, str]: ... @@ -192,8 +191,7 @@ class LogRecord: class LoggerAdapter: def __init__(self, logger: Logger, extra: Mapping[str, Any]) -> None: ... - def process(self, msg: Text, kwargs: MutableMapping[str, Any]) \ - -> Tuple[str, MutableMapping[str, Any]]: ... + def process(self, msg: Text, kwargs: MutableMapping[str, Any]) -> Tuple[str, MutableMapping[str, Any]]: ... if sys.version_info > (3,): def debug(self, msg: Text, *args: Any, exc_info: _ExcInfoType = ..., stack_info: bool = ..., extra: Dict[str, Any] = ..., diff --git a/stdlib/2and3/logging/config.pyi b/stdlib/2and3/logging/config.pyi index b2cdf6ca9..7ee9c27e3 100644 --- a/stdlib/2and3/logging/config.pyi +++ b/stdlib/2and3/logging/config.pyi @@ -17,8 +17,7 @@ if sys.version_info >= (3, 4): defaults: Optional[Dict[str, str]] = ..., disable_existing_loggers: bool = ...) -> None: ... def listen(port: int = ..., - verify: Optional[Callable[[bytes], Optional[bytes]]] = ...) \ - -> None: ... + verify: Optional[Callable[[bytes], Optional[bytes]]] = ...) -> None: ... else: def fileConfig( # type: ignore fname: Union[str, IO[str]], diff --git a/stdlib/2and3/logging/handlers.pyi b/stdlib/2and3/logging/handlers.pyi index e7223540c..c2e5cda29 100644 --- a/stdlib/2and3/logging/handlers.pyi +++ b/stdlib/2and3/logging/handlers.pyi @@ -172,8 +172,7 @@ class SMTPHandler(Handler): mailhost: Union[str, Tuple[str, int]], fromaddr: str, toaddrs: List[str], subject: str, credentials: Optional[Tuple[str, str]] = ..., - secure: Union[Tuple[str], Tuple[str, str], None] =...) \ - -> None: ... + secure: Union[Tuple[str], Tuple[str, str], None] =...) -> None: ... def getSubject(self, record: LogRecord) -> str: ... diff --git a/stdlib/2and3/zipfile.pyi b/stdlib/2and3/zipfile.pyi index e42575b79..f3be04dd8 100644 --- a/stdlib/2and3/zipfile.pyi +++ b/stdlib/2and3/zipfile.pyi @@ -56,8 +56,7 @@ class PyZipFile(ZipFile): compression: int = ..., allowZip64: bool = ..., opimize: int = ...) -> None: ... def writepy(self, pathname: str, basename: str = ..., - filterfunc: Optional[Callable[[str], bool]] = ...) \ - -> None: ... + filterfunc: Optional[Callable[[str], bool]] = ...) -> None: ... else: def writepy(self, # type: ignore pathname: str, basename: str = ...) -> None: ... diff --git a/tests/pytype_blacklist.txt b/tests/pytype_blacklist.txt index 7667e3952..fcbf4b594 100644 --- a/tests/pytype_blacklist.txt +++ b/tests/pytype_blacklist.txt @@ -21,12 +21,10 @@ 2.7/xml/etree/ElementInclude.pyi 2.7/xml/etree/ElementPath.pyi 2.7/xml/etree/ElementTree.pyi +2and3/argparse.pyi 2and3/logging/__init__.pyi -2and3/logging/config.pyi 2and3/logging/handlers.pyi 2and3/warnings.pyi 2and3/webbrowser.pyi -# These cause problems for different reasons from above -2and3/argparse.pyi -2and3/zipfile.pyi +