Akuli and srittau: Remove Python 2 branches from Python 3 stubs (#5461)

* run script and do some manual changes (Akuli)

* do the whole thing manually (srittau)

* merge changes (Akuli)

Co-authored-by: Sebastian Rittau <srittau@rittau.biz>

stdlib/ftplib.pyi

@@ -1,9 +1,8 @@
-import sys
 from _typeshed import SupportsRead, SupportsReadline
 from socket import socket
 from ssl import SSLContext
 from types import TracebackType
-from typing import Any, BinaryIO, Callable, Dict, Iterable, Iterator, List, Optional, Text, TextIO, Tuple, Type, TypeVar, Union
+from typing import Any, Callable, Dict, Iterable, Iterator, List, Optional, Text, TextIO, Tuple, Type, TypeVar, Union
 from typing_extensions import Literal
 
 _T = TypeVar("_T")
@@ -13,8 +12,7 @@ MSG_OOB: int
 FTP_PORT: int
 MAXLINE: int
 CRLF: str
-if sys.version_info >= (3,):
-    B_CRLF: bytes
+B_CRLF: bytes
 
 class Error(Exception): ...
 class error_reply(Error): ...
@@ -39,36 +37,25 @@ class FTP:
     timeout: int
     af: int
     lastresp: str
-
-    if sys.version_info >= (3,):
-        file: Optional[TextIO]
-        encoding: str
-        def __enter__(self: _T) -> _T: ...
-        def __exit__(
-            self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]
-        ) -> None: ...
-    else:
-        file: Optional[BinaryIO]
-
-    if sys.version_info >= (3, 3):
-        source_address: Optional[Tuple[str, int]]
-        def __init__(
-            self,
-            host: Text = ...,
-            user: Text = ...,
-            passwd: Text = ...,
-            acct: Text = ...,
-            timeout: float = ...,
-            source_address: Optional[Tuple[str, int]] = ...,
-        ) -> None: ...
-        def connect(
-            self, host: Text = ..., port: int = ..., timeout: float = ..., source_address: Optional[Tuple[str, int]] = ...
-        ) -> str: ...
-    else:
-        def __init__(
-            self, host: Text = ..., user: Text = ..., passwd: Text = ..., acct: Text = ..., timeout: float = ...
-        ) -> None: ...
-        def connect(self, host: Text = ..., port: int = ..., timeout: float = ...) -> str: ...
+    file: Optional[TextIO]
+    encoding: str
+    def __enter__(self: _T) -> _T: ...
+    def __exit__(
+        self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]
+    ) -> None: ...
+    source_address: Optional[Tuple[str, int]]
+    def __init__(
+        self,
+        host: Text = ...,
+        user: Text = ...,
+        passwd: Text = ...,
+        acct: Text = ...,
+        timeout: float = ...,
+        source_address: Optional[Tuple[str, int]] = ...,
+    ) -> None: ...
+    def connect(
+        self, host: Text = ..., port: int = ..., timeout: float = ..., source_address: Optional[Tuple[str, int]] = ...
+    ) -> str: ...
     def getwelcome(self) -> str: ...
     def set_debuglevel(self, level: int) -> None: ...
     def debug(self, level: int) -> None: ...
@@ -108,8 +95,7 @@ class FTP:
     def nlst(self, *args: Text) -> List[str]: ...
     # Technically only the last arg can be a Callable but ...
     def dir(self, *args: Union[str, Callable[[str], None]]) -> None: ...
-    if sys.version_info >= (3, 3):
-        def mlsd(self, path: Text = ..., facts: Iterable[str] = ...) -> Iterator[Tuple[str, Dict[str, str]]]: ...
+    def mlsd(self, path: Text = ..., facts: Iterable[str] = ...) -> Iterator[Tuple[str, Dict[str, str]]]: ...
     def rename(self, fromname: Text, toname: Text) -> str: ...
     def delete(self, filename: Text) -> str: ...
     def cwd(self, dirname: Text) -> str: ...
@@ -141,16 +127,7 @@ class FTP_TLS(FTP):
     def auth(self) -> str: ...
     def prot_p(self) -> str: ...
     def prot_c(self) -> str: ...
-    if sys.version_info >= (3, 3):
-        def ccc(self) -> str: ...
-
-if sys.version_info < (3,):
-    class Netrc:
-        def __init__(self, filename: Optional[Text] = ...) -> None: ...
-        def get_hosts(self) -> List[str]: ...
-        def get_account(self, host: Text) -> Tuple[Optional[str], Optional[str], Optional[str]]: ...
-        def get_macros(self) -> List[str]: ...
-        def get_macro(self, macro: Text) -> Tuple[str, ...]: ...
+    def ccc(self) -> str: ...
 
 def parse150(resp: str) -> Optional[int]: ...  # undocumented
 def parse227(resp: str) -> Tuple[str, int]: ...  # undocumented