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/threading.pyi

@@ -11,20 +11,11 @@ _T = TypeVar("_T")
 __all__: List[str]
 
 def active_count() -> int: ...
-
-if sys.version_info < (3,):
-    def activeCount() -> int: ...
-
 def current_thread() -> Thread: ...
 def currentThread() -> Thread: ...
-
-if sys.version_info >= (3,):
-    def get_ident() -> int: ...
-
+def get_ident() -> int: ...
 def enumerate() -> List[Thread]: ...
-
-if sys.version_info >= (3, 4):
-    def main_thread() -> Thread: ...
+def main_thread() -> Thread: ...
 
 if sys.version_info >= (3, 8):
     from _thread import get_native_id as get_native_id
@@ -33,8 +24,7 @@ def settrace(func: _TF) -> None: ...
 def setprofile(func: Optional[_PF]) -> None: ...
 def stack_size(size: int = ...) -> int: ...
 
-if sys.version_info >= (3,):
-    TIMEOUT_MAX: float
+TIMEOUT_MAX: float
 
 class ThreadError(Exception): ...
 
@@ -47,26 +37,16 @@ class Thread:
     name: str
     ident: Optional[int]
     daemon: bool
-    if sys.version_info >= (3,):
-        def __init__(
-            self,
-            group: None = ...,
-            target: Optional[Callable[..., Any]] = ...,
-            name: Optional[str] = ...,
-            args: Iterable[Any] = ...,
-            kwargs: Optional[Mapping[str, Any]] = ...,
-            *,
-            daemon: Optional[bool] = ...,
-        ) -> None: ...
-    else:
-        def __init__(
-            self,
-            group: None = ...,
-            target: Optional[Callable[..., Any]] = ...,
-            name: Optional[Text] = ...,
-            args: Iterable[Any] = ...,
-            kwargs: Optional[Mapping[Text, Any]] = ...,
-        ) -> None: ...
+    def __init__(
+        self,
+        group: None = ...,
+        target: Optional[Callable[..., Any]] = ...,
+        name: Optional[str] = ...,
+        args: Iterable[Any] = ...,
+        kwargs: Optional[Mapping[str, Any]] = ...,
+        *,
+        daemon: Optional[bool] = ...,
+    ) -> None: ...
     def start(self) -> None: ...
     def run(self) -> None: ...
     def join(self, timeout: Optional[float] = ...) -> None: ...
@@ -89,10 +69,7 @@ class Lock:
     def __exit__(
         self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]
     ) -> Optional[bool]: ...
-    if sys.version_info >= (3,):
-        def acquire(self, blocking: bool = ..., timeout: float = ...) -> bool: ...
-    else:
-        def acquire(self, blocking: bool = ...) -> bool: ...
+    def acquire(self, blocking: bool = ..., timeout: float = ...) -> bool: ...
     def release(self) -> None: ...
     def locked(self) -> bool: ...
 
@@ -102,10 +79,7 @@ class _RLock:
     def __exit__(
         self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]
     ) -> Optional[bool]: ...
-    if sys.version_info >= (3,):
-        def acquire(self, blocking: bool = ..., timeout: float = ...) -> bool: ...
-    else:
-        def acquire(self, blocking: bool = ...) -> bool: ...
+    def acquire(self, blocking: bool = ..., timeout: float = ...) -> bool: ...
     def release(self) -> None: ...
 
 RLock = _RLock
@@ -116,14 +90,10 @@ class Condition:
     def __exit__(
         self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]
     ) -> Optional[bool]: ...
-    if sys.version_info >= (3,):
-        def acquire(self, blocking: bool = ..., timeout: float = ...) -> bool: ...
-    else:
-        def acquire(self, blocking: bool = ...) -> bool: ...
+    def acquire(self, blocking: bool = ..., timeout: float = ...) -> bool: ...
     def release(self) -> None: ...
     def wait(self, timeout: Optional[float] = ...) -> bool: ...
-    if sys.version_info >= (3,):
-        def wait_for(self, predicate: Callable[[], _T], timeout: Optional[float] = ...) -> _T: ...
+    def wait_for(self, predicate: Callable[[], _T], timeout: Optional[float] = ...) -> _T: ...
     def notify(self, n: int = ...) -> None: ...
     def notify_all(self) -> None: ...
     def notifyAll(self) -> None: ...
@@ -133,12 +103,8 @@ class Semaphore:
     def __exit__(
         self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]
     ) -> Optional[bool]: ...
-    if sys.version_info >= (3,):
-        def acquire(self, blocking: bool = ..., timeout: Optional[float] = ...) -> bool: ...
-        def __enter__(self, blocking: bool = ..., timeout: Optional[float] = ...) -> bool: ...
-    else:
-        def acquire(self, blocking: bool = ...) -> bool: ...
-        def __enter__(self, blocking: bool = ...) -> bool: ...
+    def acquire(self, blocking: bool = ..., timeout: Optional[float] = ...) -> bool: ...
+    def __enter__(self, blocking: bool = ..., timeout: Optional[float] = ...) -> bool: ...
     if sys.version_info >= (3, 9):
         def release(self, n: int = ...) -> None: ...
     else:
@@ -149,8 +115,6 @@ class BoundedSemaphore(Semaphore): ...
 class Event:
     def __init__(self) -> None: ...
     def is_set(self) -> bool: ...
-    if sys.version_info < (3,):
-        def isSet(self) -> bool: ...
     def set(self) -> None: ...
     def clear(self) -> None: ...
     def wait(self, timeout: Optional[float] = ...) -> bool: ...
@@ -162,27 +126,22 @@ if sys.version_info >= (3, 8):
     ExceptHookArgs = _ExceptHookArgs
 
 class Timer(Thread):
-    if sys.version_info >= (3,):
-        def __init__(
-            self,
-            interval: float,
-            function: Callable[..., Any],
-            args: Optional[Iterable[Any]] = ...,
-            kwargs: Optional[Mapping[str, Any]] = ...,
-        ) -> None: ...
-    else:
-        def __init__(
-            self, interval: float, function: Callable[..., Any], args: Iterable[Any] = ..., kwargs: Mapping[str, Any] = ...
-        ) -> None: ...
+    def __init__(
+        self,
+        interval: float,
+        function: Callable[..., Any],
+        args: Optional[Iterable[Any]] = ...,
+        kwargs: Optional[Mapping[str, Any]] = ...,
+    ) -> None: ...
     def cancel(self) -> None: ...
 
-if sys.version_info >= (3,):
-    class Barrier:
-        parties: int
-        n_waiting: int
-        broken: bool
-        def __init__(self, parties: int, action: Optional[Callable[[], None]] = ..., timeout: Optional[float] = ...) -> None: ...
-        def wait(self, timeout: Optional[float] = ...) -> int: ...
-        def reset(self) -> None: ...
-        def abort(self) -> None: ...
-    class BrokenBarrierError(RuntimeError): ...
+class Barrier:
+    parties: int
+    n_waiting: int
+    broken: bool
+    def __init__(self, parties: int, action: Optional[Callable[[], None]] = ..., timeout: Optional[float] = ...) -> None: ...
+    def wait(self, timeout: Optional[float] = ...) -> int: ...
+    def reset(self) -> None: ...
+    def abort(self) -> None: ...
+
+class BrokenBarrierError(RuntimeError): ...