clean python 3 specific stuff from stdlib/@python2 stubs

stdlib/@python2/__future__.pyi

@@ -14,13 +14,4 @@ nested_scopes: _Feature
 print_function: _Feature
 unicode_literals: _Feature
 with_statement: _Feature
-if sys.version_info >= (3, 0):
-    barry_as_FLUFL: _Feature
-
-if sys.version_info >= (3, 5):
-    generator_stop: _Feature
-
-if sys.version_info >= (3, 7):
-    annotations: _Feature
-
 all_feature_names: List[str]  # undocumented

stdlib/@python2/_bisect.pyi

@@ -4,32 +4,7 @@ from typing import Callable, MutableSequence, Optional, Sequence, TypeVar
 
 _T = TypeVar("_T")
 
-if sys.version_info >= (3, 10):
-    def bisect_left(
-        a: Sequence[_T], x: _T, lo: int = ..., hi: Optional[int] = ..., *, key: Optional[Callable[[_T], SupportsLessThan]] = ...
-    ) -> int: ...
-    def bisect_right(
-        a: Sequence[_T], x: _T, lo: int = ..., hi: Optional[int] = ..., *, key: Optional[Callable[[_T], SupportsLessThan]] = ...
-    ) -> int: ...
-    def insort_left(
-        a: MutableSequence[_T],
-        x: _T,
-        lo: int = ...,
-        hi: Optional[int] = ...,
-        *,
-        key: Optional[Callable[[_T], SupportsLessThan]] = ...,
-    ) -> None: ...
-    def insort_right(
-        a: MutableSequence[_T],
-        x: _T,
-        lo: int = ...,
-        hi: Optional[int] = ...,
-        *,
-        key: Optional[Callable[[_T], SupportsLessThan]] = ...,
-    ) -> None: ...
-
-else:
-    def bisect_left(a: Sequence[_T], x: _T, lo: int = ..., hi: Optional[int] = ...) -> int: ...
-    def bisect_right(a: Sequence[_T], x: _T, lo: int = ..., hi: Optional[int] = ...) -> int: ...
-    def insort_left(a: MutableSequence[_T], x: _T, lo: int = ..., hi: Optional[int] = ...) -> None: ...
-    def insort_right(a: MutableSequence[_T], x: _T, lo: int = ..., hi: Optional[int] = ...) -> None: ...
+def bisect_left(a: Sequence[_T], x: _T, lo: int = ..., hi: Optional[int] = ...) -> int: ...
+def bisect_right(a: Sequence[_T], x: _T, lo: int = ..., hi: Optional[int] = ...) -> int: ...
+def insort_left(a: MutableSequence[_T], x: _T, lo: int = ..., hi: Optional[int] = ...) -> None: ...
+def insort_right(a: MutableSequence[_T], x: _T, lo: int = ..., hi: Optional[int] = ...) -> None: ...

stdlib/@python2/_codecs.pyi

@@ -6,12 +6,8 @@ from typing import Any, Callable, Dict, Optional, Text, Tuple, Union
 _Handler = Callable[[Exception], Tuple[Text, int]]
 _String = Union[bytes, str]
 _Errors = Union[str, Text, None]
-if sys.version_info >= (3, 0):
-    _Decodable = bytes
-    _Encodable = str
-else:
-    _Decodable = Union[bytes, Text]
-    _Encodable = Union[bytes, Text]
+_Decodable = Union[bytes, Text]
+_Encodable = Union[bytes, Text]
 
 # This type is not exposed; it is defined in unicodeobject.c
 class _EncodingMap(object):
@@ -28,10 +24,7 @@ def encode(obj: Any, encoding: Union[str, Text] = ..., errors: _Errors = ...) ->
 def charmap_build(__map: Text) -> _MapT: ...
 def ascii_decode(__data: _Decodable, __errors: _Errors = ...) -> Tuple[Text, int]: ...
 def ascii_encode(__str: _Encodable, __errors: _Errors = ...) -> Tuple[bytes, int]: ...
-
-if sys.version_info < (3, 2):
-    def charbuffer_encode(__data: _Encodable, __errors: _Errors = ...) -> Tuple[bytes, int]: ...
-
+def charbuffer_encode(__data: _Encodable, __errors: _Errors = ...) -> Tuple[bytes, int]: ...
 def charmap_decode(__data: _Decodable, __errors: _Errors = ..., __mapping: Optional[_MapT] = ...) -> Tuple[Text, int]: ...
 def charmap_encode(__str: _Encodable, __errors: _Errors = ..., __mapping: Optional[_MapT] = ...) -> Tuple[bytes, int]: ...
 def escape_decode(__data: _String, __errors: _Errors = ...) -> Tuple[str, int]: ...
@@ -43,11 +36,8 @@ def raw_unicode_escape_encode(__str: _Encodable, __errors: _Errors = ...) -> Tup
 def readbuffer_encode(__data: _String, __errors: _Errors = ...) -> Tuple[bytes, int]: ...
 def unicode_escape_decode(__data: _String, __errors: _Errors = ...) -> Tuple[Text, int]: ...
 def unicode_escape_encode(__str: _Encodable, __errors: _Errors = ...) -> Tuple[bytes, int]: ...
-
-if sys.version_info < (3, 8):
-    def unicode_internal_decode(__obj: _String, __errors: _Errors = ...) -> Tuple[Text, int]: ...
-    def unicode_internal_encode(__obj: _String, __errors: _Errors = ...) -> Tuple[bytes, int]: ...
-
+def unicode_internal_decode(__obj: _String, __errors: _Errors = ...) -> Tuple[Text, int]: ...
+def unicode_internal_encode(__obj: _String, __errors: _Errors = ...) -> Tuple[bytes, int]: ...
 def utf_16_be_decode(__data: _Decodable, __errors: _Errors = ..., __final: int = ...) -> Tuple[Text, int]: ...
 def utf_16_be_encode(__str: _Encodable, __errors: _Errors = ...) -> Tuple[bytes, int]: ...
 def utf_16_decode(__data: _Decodable, __errors: _Errors = ..., __final: int = ...) -> Tuple[Text, int]: ...
@@ -74,9 +64,3 @@ def utf_8_encode(__str: _Encodable, __errors: _Errors = ...) -> Tuple[bytes, int
 if sys.platform == "win32":
     def mbcs_decode(__data: _Decodable, __errors: _Errors = ..., __final: int = ...) -> Tuple[Text, int]: ...
     def mbcs_encode(__str: _Encodable, __errors: _Errors = ...) -> Tuple[bytes, int]: ...
-    if sys.version_info >= (3, 0):
-        def code_page_decode(__codepage: int, __data: bytes, __errors: _Errors = ..., __final: int = ...) -> Tuple[Text, int]: ...
-        def code_page_encode(__code_page: int, __str: Text, __errors: _Errors = ...) -> Tuple[bytes, int]: ...
-    if sys.version_info >= (3, 6):
-        def oem_decode(__data: bytes, __errors: _Errors = ..., __final: int = ...) -> Tuple[Text, int]: ...
-        def oem_encode(__str: Text, __errors: _Errors = ...) -> Tuple[bytes, int]: ...

stdlib/@python2/_csv.pyi

@@ -24,20 +24,12 @@ _DialectLike = Union[str, Dialect, Type[Dialect]]
 class _reader(Iterator[List[str]]):
     dialect: Dialect
     line_num: int
-    if sys.version_info >= (3, 0):
-        def __next__(self) -> List[str]: ...
-    else:
-        def next(self) -> List[str]: ...
+    def next(self) -> List[str]: ...
 
 class _writer:
     dialect: Dialect
-
-    if sys.version_info >= (3, 5):
-        def writerow(self, row: Iterable[Any]) -> Any: ...
-        def writerows(self, rows: Iterable[Iterable[Any]]) -> None: ...
-    else:
-        def writerow(self, row: Sequence[Any]) -> Any: ...
-        def writerows(self, rows: Iterable[Sequence[Any]]) -> None: ...
+    def writerow(self, row: Sequence[Any]) -> Any: ...
+    def writerows(self, rows: Iterable[Sequence[Any]]) -> None: ...
 
 class _Writer(Protocol):
     def write(self, s: str) -> Any: ...

stdlib/@python2/_curses.pyi

@@ -57,8 +57,6 @@ A_COLOR: int
 A_DIM: int
 A_HORIZONTAL: int
 A_INVIS: int
-if sys.version_info >= (3, 7):
-    A_ITALIC: int
 A_LEFT: int
 A_LOW: int
 A_NORMAL: int
@@ -269,12 +267,7 @@ def cbreak(__flag: bool = ...) -> None: ...
 def color_content(__color_number: int) -> Tuple[int, int, int]: ...
 
 # Changed in Python 3.8.8 and 3.9.2
-if sys.version_info >= (3, 8):
-    def color_pair(pair_number: int) -> int: ...
-
-else:
-    def color_pair(__color_number: int) -> int: ...
-
+def color_pair(__color_number: int) -> int: ...
 def curs_set(__visibility: int) -> int: ...
 def def_prog_mode() -> None: ...
 def def_shell_mode() -> None: ...
@@ -348,24 +341,14 @@ def tparm(
 ) -> bytes: ...
 def typeahead(__fd: int) -> None: ...
 def unctrl(__ch: _chtype) -> bytes: ...
-
-if sys.version_info >= (3, 3):
-    def unget_wch(__ch: Union[int, str]) -> None: ...
-
 def ungetch(__ch: _chtype) -> None: ...
 def ungetmouse(__id: int, __x: int, __y: int, __z: int, __bstate: int) -> None: ...
-
-if sys.version_info >= (3, 5):
-    def update_lines_cols() -> int: ...
-
 def use_default_colors() -> None: ...
 def use_env(__flag: bool) -> None: ...
 
 class error(Exception): ...
 
 class _CursesWindow:
-    if sys.version_info >= (3, 3):
-        encoding: str
     @overload
     def addch(self, ch: _chtype, attr: int = ...) -> None: ...
     @overload
@@ -429,11 +412,6 @@ class _CursesWindow:
     def getch(self) -> int: ...
     @overload
     def getch(self, y: int, x: int) -> int: ...
-    if sys.version_info >= (3, 3):
-        @overload
-        def get_wch(self) -> Union[int, str]: ...
-        @overload
-        def get_wch(self, y: int, x: int) -> Union[int, str]: ...
     @overload
     def getkey(self) -> str: ...
     @overload
@@ -532,11 +510,3 @@ class _CursesWindow:
     def vline(self, ch: _chtype, n: int) -> None: ...
     @overload
     def vline(self, y: int, x: int, ch: _chtype, n: int) -> None: ...
-
-if sys.version_info >= (3, 8):
-    class _ncurses_version(NamedTuple):
-        major: int
-        minor: int
-        patch: int
-    ncurses_version: _ncurses_version
-    window = _CursesWindow  # undocumented

stdlib/@python2/_dummy_threading.pyi

@@ -11,31 +11,14 @@ _T = TypeVar("_T")
 __all__: List[str]
 
 def active_count() -> int: ...
-
-if sys.version_info < (3,):
-    def activeCount() -> int: ...
-
+def activeCount() -> int: ...
 def current_thread() -> Thread: ...
 def currentThread() -> Thread: ...
-
-if sys.version_info >= (3,):
-    def get_ident() -> int: ...
-
 def enumerate() -> List[Thread]: ...
-
-if sys.version_info >= (3, 4):
-    def main_thread() -> Thread: ...
-
-if sys.version_info >= (3, 8):
-    from _thread import get_native_id as get_native_id
-
 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
-
 class ThreadError(Exception): ...
 
 class local(object):
@@ -47,37 +30,21 @@ 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[Text] = ...,
+        args: Iterable[Any] = ...,
+        kwargs: Optional[Mapping[Text, Any]] = ...,
+    ) -> None: ...
     def start(self) -> None: ...
     def run(self) -> None: ...
     def join(self, timeout: Optional[float] = ...) -> None: ...
     def getName(self) -> str: ...
     def setName(self, name: Text) -> None: ...
-    if sys.version_info >= (3, 8):
-        @property
-        def native_id(self) -> Optional[int]: ...  # only available on some platforms
     def is_alive(self) -> bool: ...
-    if sys.version_info < (3, 9):
-        def isAlive(self) -> bool: ...
+    def isAlive(self) -> bool: ...
     def isDaemon(self) -> bool: ...
     def setDaemon(self, daemonic: bool) -> None: ...
 
@@ -89,10 +56,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 = ...) -> bool: ...
     def release(self) -> None: ...
     def locked(self) -> bool: ...
 
@@ -102,10 +66,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 = ...) -> bool: ...
     def release(self) -> None: ...
 
 RLock = _RLock
@@ -116,14 +77,9 @@ 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 = ...) -> 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 notify(self, n: int = ...) -> None: ...
     def notify_all(self) -> None: ...
     def notifyAll(self) -> None: ...
@@ -133,56 +89,22 @@ 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: ...
-    if sys.version_info >= (3, 9):
-        def release(self, n: int = ...) -> None: ...
-    else:
-        def release(self) -> None: ...
+    def acquire(self, blocking: bool = ...) -> bool: ...
+    def __enter__(self, blocking: bool = ...) -> bool: ...
+    def release(self) -> None: ...
 
 class BoundedSemaphore(Semaphore): ...
 
 class Event:
     def __init__(self) -> None: ...
     def is_set(self) -> bool: ...
-    if sys.version_info < (3,):
-        def isSet(self) -> bool: ...
+    def isSet(self) -> bool: ...
     def set(self) -> None: ...
     def clear(self) -> None: ...
     def wait(self, timeout: Optional[float] = ...) -> bool: ...
 
-if sys.version_info >= (3, 8):
-    from _thread import _excepthook, _ExceptHookArgs
-
-    excepthook = _excepthook
-    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: Iterable[Any] = ..., kwargs: 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): ...

stdlib/@python2/_heapq.pyi

@@ -8,7 +8,5 @@ def heappop(__heap: List[_T]) -> _T: ...
 def heappush(__heap: List[_T], __item: _T) -> None: ...
 def heappushpop(__heap: List[_T], __item: _T) -> _T: ...
 def heapreplace(__heap: List[_T], __item: _T) -> _T: ...
-
-if sys.version_info < (3,):
-    def nlargest(__n: int, __iterable: Iterable[_T], __key: Optional[Callable[[_T], Any]] = ...) -> List[_T]: ...
-    def nsmallest(__n: int, __iterable: Iterable[_T], __key: Optional[Callable[[_T], Any]] = ...) -> List[_T]: ...
+def nlargest(__n: int, __iterable: Iterable[_T], __key: Optional[Callable[[_T], Any]] = ...) -> List[_T]: ...
+def nsmallest(__n: int, __iterable: Iterable[_T], __key: Optional[Callable[[_T], Any]] = ...) -> List[_T]: ...

stdlib/@python2/_random.pyi

@@ -11,5 +11,4 @@ class Random(object):
     def setstate(self, __state: _State) -> None: ...
     def random(self) -> float: ...
     def getrandbits(self, __k: int) -> int: ...
-    if sys.version_info < (3,):
-        def jumpahead(self, i: int) -> None: ...
+    def jumpahead(self, i: int) -> None: ...