clean python 3 specific stuff from stdlib/@python2 stubs (#5451)

2025-12-10 05:51:52 +08:00 · 2021-05-15 01:19:05 +03:00
parent f94d838814
commit 5ec4f06263
121 changed files with 1024 additions and 4801 deletions
--- a/stdlib/@python2/datetime.pyi
+++ b/stdlib/@python2/datetime.pyi
@@ -4,10 +4,7 @@ from typing import AnyStr, ClassVar, NamedTuple, Optional, SupportsAbs, Tuple, T

 _S = TypeVar("_S")

-if sys.version_info >= (3,):
-    _Text = str
-else:
-    _Text = Union[str, unicode]
+_Text = Union[str, unicode]

 MINYEAR: int
 MAXYEAR: int
@@ -18,20 +15,6 @@ class tzinfo:
    def dst(self, dt: Optional[datetime]) -> Optional[timedelta]: ...
    def fromutc(self, dt: datetime) -> datetime: ...

-if sys.version_info >= (3, 2):
-    class timezone(tzinfo):
-        utc: ClassVar[timezone]
-        min: ClassVar[timezone]
-        max: ClassVar[timezone]
-        def __init__(self, offset: timedelta, name: str = ...) -> None: ...
-        def __hash__(self) -> int: ...
-
-if sys.version_info >= (3, 9):
-    class _IsoCalendarDate(NamedTuple):
-        year: int
-        week: int
-        weekday: int
-
 _tzinfo = tzinfo

 class date:
@@ -45,12 +28,6 @@ class date:
    def today(cls: Type[_S]) -> _S: ...
    @classmethod
    def fromordinal(cls: Type[_S], n: int) -> _S: ...
-    if sys.version_info >= (3, 7):
-        @classmethod
-        def fromisoformat(cls: Type[_S], date_string: str) -> _S: ...
-    if sys.version_info >= (3, 8):
-        @classmethod
-        def fromisocalendar(cls: Type[_S], year: int, week: int, day: int) -> _S: ...
    @property
    def year(self) -> int: ...
    @property
@@ -59,10 +36,7 @@ class date:
    def day(self) -> int: ...
    def ctime(self) -> str: ...
    def strftime(self, fmt: _Text) -> str: ...
-    if sys.version_info >= (3,):
-        def __format__(self, fmt: str) -> str: ...
-    else:
-        def __format__(self, fmt: AnyStr) -> AnyStr: ...
+    def __format__(self, fmt: AnyStr) -> AnyStr: ...
    def isoformat(self) -> str: ...
    def timetuple(self) -> struct_time: ...
    def toordinal(self) -> int: ...
@@ -71,12 +45,8 @@ class date:
    def __lt__(self, other: date) -> bool: ...
    def __ge__(self, other: date) -> bool: ...
    def __gt__(self, other: date) -> bool: ...
-    if sys.version_info >= (3, 8):
-        def __add__(self: _S, other: timedelta) -> _S: ...
-        def __radd__(self: _S, other: timedelta) -> _S: ...
-    else:
-        def __add__(self, other: timedelta) -> date: ...
-        def __radd__(self, other: timedelta) -> date: ...
+    def __add__(self, other: timedelta) -> date: ...
+    def __radd__(self, other: timedelta) -> date: ...
    @overload
    def __sub__(self, other: timedelta) -> date: ...
    @overload
@@ -84,31 +54,15 @@ class date:
    def __hash__(self) -> int: ...
    def weekday(self) -> int: ...
    def isoweekday(self) -> int: ...
-    if sys.version_info >= (3, 9):
-        def isocalendar(self) -> _IsoCalendarDate: ...
-    else:
-        def isocalendar(self) -> Tuple[int, int, int]: ...
+    def isocalendar(self) -> Tuple[int, int, int]: ...

 class time:
    min: ClassVar[time]
    max: ClassVar[time]
    resolution: ClassVar[timedelta]
-
-    if sys.version_info >= (3, 6):
-        def __init__(
-            self,
-            hour: int = ...,
-            minute: int = ...,
-            second: int = ...,
-            microsecond: int = ...,
-            tzinfo: Optional[_tzinfo] = ...,
-            *,
-            fold: int = ...,
-        ) -> None: ...
-    else:
-        def __init__(
-            self, hour: int = ..., minute: int = ..., second: int = ..., microsecond: int = ..., tzinfo: Optional[_tzinfo] = ...
-        ) -> None: ...
+    def __init__(
+        self, hour: int = ..., minute: int = ..., second: int = ..., microsecond: int = ..., tzinfo: Optional[_tzinfo] = ...
+    ) -> None: ...
    @property
    def hour(self) -> int: ...
    @property
@@ -119,44 +73,20 @@ class time:
    def microsecond(self) -> int: ...
    @property
    def tzinfo(self) -> Optional[_tzinfo]: ...
-    if sys.version_info >= (3, 6):
-        @property
-        def fold(self) -> int: ...
    def __le__(self, other: time) -> bool: ...
    def __lt__(self, other: time) -> bool: ...
    def __ge__(self, other: time) -> bool: ...
    def __gt__(self, other: time) -> bool: ...
    def __hash__(self) -> int: ...
-    if sys.version_info >= (3, 6):
-        def isoformat(self, timespec: str = ...) -> str: ...
-    else:
-        def isoformat(self) -> str: ...
-    if sys.version_info >= (3, 7):
-        @classmethod
-        def fromisoformat(cls: Type[_S], time_string: str) -> _S: ...
+    def isoformat(self) -> str: ...
    def strftime(self, fmt: _Text) -> str: ...
-    if sys.version_info >= (3,):
-        def __format__(self, fmt: str) -> str: ...
-    else:
-        def __format__(self, fmt: AnyStr) -> AnyStr: ...
+    def __format__(self, fmt: AnyStr) -> AnyStr: ...
    def utcoffset(self) -> Optional[timedelta]: ...
    def tzname(self) -> Optional[str]: ...
    def dst(self) -> Optional[timedelta]: ...
-    if sys.version_info >= (3, 6):
-        def replace(
-            self,
-            hour: int = ...,
-            minute: int = ...,
-            second: int = ...,
-            microsecond: int = ...,
-            tzinfo: Optional[_tzinfo] = ...,
-            *,
-            fold: int = ...,
-        ) -> time: ...
-    else:
-        def replace(
-            self, hour: int = ..., minute: int = ..., second: int = ..., microsecond: int = ..., tzinfo: Optional[_tzinfo] = ...
-        ) -> time: ...
+    def replace(
+        self, hour: int = ..., minute: int = ..., second: int = ..., microsecond: int = ..., tzinfo: Optional[_tzinfo] = ...
+    ) -> time: ...

 _date = date
 _time = time
@@ -165,31 +95,16 @@ class timedelta(SupportsAbs[timedelta]):
    min: ClassVar[timedelta]
    max: ClassVar[timedelta]
    resolution: ClassVar[timedelta]
-
-    if sys.version_info >= (3, 6):
-        def __init__(
-            self,
-            days: float = ...,
-            seconds: float = ...,
-            microseconds: float = ...,
-            milliseconds: float = ...,
-            minutes: float = ...,
-            hours: float = ...,
-            weeks: float = ...,
-            *,
-            fold: int = ...,
-        ) -> None: ...
-    else:
-        def __init__(
-            self,
-            days: float = ...,
-            seconds: float = ...,
-            microseconds: float = ...,
-            milliseconds: float = ...,
-            minutes: float = ...,
-            hours: float = ...,
-            weeks: float = ...,
-        ) -> None: ...
+    def __init__(
+        self,
+        days: float = ...,
+        seconds: float = ...,
+        microseconds: float = ...,
+        milliseconds: float = ...,
+        minutes: float = ...,
+        hours: float = ...,
+        weeks: float = ...,
+    ) -> None: ...
    @property
    def days(self) -> int: ...
    @property
@@ -210,18 +125,10 @@ class timedelta(SupportsAbs[timedelta]):
    def __floordiv__(self, other: timedelta) -> int: ...
    @overload
    def __floordiv__(self, other: int) -> timedelta: ...
-    if sys.version_info >= (3,):
-        @overload
-        def __truediv__(self, other: timedelta) -> float: ...
-        @overload
-        def __truediv__(self, other: float) -> timedelta: ...
-        def __mod__(self, other: timedelta) -> timedelta: ...
-        def __divmod__(self, other: timedelta) -> Tuple[int, timedelta]: ...
-    else:
-        @overload
-        def __div__(self, other: timedelta) -> float: ...
-        @overload
-        def __div__(self, other: float) -> timedelta: ...
+    @overload
+    def __div__(self, other: timedelta) -> float: ...
+    @overload
+    def __div__(self, other: float) -> timedelta: ...
    def __le__(self, other: timedelta) -> bool: ...
    def __lt__(self, other: timedelta) -> bool: ...
    def __ge__(self, other: timedelta) -> bool: ...
@@ -232,33 +139,17 @@ class datetime(date):
    min: ClassVar[datetime]
    max: ClassVar[datetime]
    resolution: ClassVar[timedelta]
-
-    if sys.version_info >= (3, 6):
-        def __new__(
-            cls: Type[_S],
-            year: int,
-            month: int,
-            day: int,
-            hour: int = ...,
-            minute: int = ...,
-            second: int = ...,
-            microsecond: int = ...,
-            tzinfo: Optional[_tzinfo] = ...,
-            *,
-            fold: int = ...,
-        ) -> _S: ...
-    else:
-        def __new__(
-            cls: Type[_S],
-            year: int,
-            month: int,
-            day: int,
-            hour: int = ...,
-            minute: int = ...,
-            second: int = ...,
-            microsecond: int = ...,
-            tzinfo: Optional[_tzinfo] = ...,
-        ) -> _S: ...
+    def __new__(
+        cls: Type[_S],
+        year: int,
+        month: int,
+        day: int,
+        hour: int = ...,
+        minute: int = ...,
+        second: int = ...,
+        microsecond: int = ...,
+        tzinfo: Optional[_tzinfo] = ...,
+    ) -> _S: ...
    @property
    def year(self) -> int: ...
    @property
@@ -275,9 +166,6 @@ class datetime(date):
    def microsecond(self) -> int: ...
    @property
    def tzinfo(self) -> Optional[_tzinfo]: ...
-    if sys.version_info >= (3, 6):
-        @property
-        def fold(self) -> int: ...
    @classmethod
    def fromtimestamp(cls: Type[_S], t: float, tz: Optional[_tzinfo] = ...) -> _S: ...
    @classmethod
@@ -286,77 +174,38 @@ class datetime(date):
    def today(cls: Type[_S]) -> _S: ...
    @classmethod
    def fromordinal(cls: Type[_S], n: int) -> _S: ...
-    if sys.version_info >= (3, 8):
-        @classmethod
-        def now(cls: Type[_S], tz: Optional[_tzinfo] = ...) -> _S: ...
-    else:
-        @overload
-        @classmethod
-        def now(cls: Type[_S], tz: None = ...) -> _S: ...
-        @overload
-        @classmethod
-        def now(cls, tz: _tzinfo) -> datetime: ...
+    @overload
+    @classmethod
+    def now(cls: Type[_S], tz: None = ...) -> _S: ...
+    @overload
+    @classmethod
+    def now(cls, tz: _tzinfo) -> datetime: ...
    @classmethod
    def utcnow(cls: Type[_S]) -> _S: ...
-    if sys.version_info >= (3, 6):
-        @classmethod
-        def combine(cls, date: _date, time: _time, tzinfo: Optional[_tzinfo] = ...) -> datetime: ...
-    else:
-        @classmethod
-        def combine(cls, date: _date, time: _time) -> datetime: ...
-    if sys.version_info >= (3, 7):
-        @classmethod
-        def fromisoformat(cls: Type[_S], date_string: str) -> _S: ...
+    @classmethod
+    def combine(cls, date: _date, time: _time) -> datetime: ...
    def strftime(self, fmt: _Text) -> str: ...
-    if sys.version_info >= (3,):
-        def __format__(self, fmt: str) -> str: ...
-    else:
-        def __format__(self, fmt: AnyStr) -> AnyStr: ...
+    def __format__(self, fmt: AnyStr) -> AnyStr: ...
    def toordinal(self) -> int: ...
    def timetuple(self) -> struct_time: ...
-    if sys.version_info >= (3, 3):
-        def timestamp(self) -> float: ...
    def utctimetuple(self) -> struct_time: ...
    def date(self) -> _date: ...
    def time(self) -> _time: ...
    def timetz(self) -> _time: ...
-    if sys.version_info >= (3, 6):
-        def replace(
-            self,
-            year: int = ...,
-            month: int = ...,
-            day: int = ...,
-            hour: int = ...,
-            minute: int = ...,
-            second: int = ...,
-            microsecond: int = ...,
-            tzinfo: Optional[_tzinfo] = ...,
-            *,
-            fold: int = ...,
-        ) -> datetime: ...
-    else:
-        def replace(
-            self,
-            year: int = ...,
-            month: int = ...,
-            day: int = ...,
-            hour: int = ...,
-            minute: int = ...,
-            second: int = ...,
-            microsecond: int = ...,
-            tzinfo: Optional[_tzinfo] = ...,
-        ) -> datetime: ...
-    if sys.version_info >= (3, 8):
-        def astimezone(self: _S, tz: Optional[_tzinfo] = ...) -> _S: ...
-    elif sys.version_info >= (3, 3):
-        def astimezone(self, tz: Optional[_tzinfo] = ...) -> datetime: ...
-    else:
-        def astimezone(self, tz: _tzinfo) -> datetime: ...
+    def replace(
+        self,
+        year: int = ...,
+        month: int = ...,
+        day: int = ...,
+        hour: int = ...,
+        minute: int = ...,
+        second: int = ...,
+        microsecond: int = ...,
+        tzinfo: Optional[_tzinfo] = ...,
+    ) -> datetime: ...
+    def astimezone(self, tz: _tzinfo) -> datetime: ...
    def ctime(self) -> str: ...
-    if sys.version_info >= (3, 6):
-        def isoformat(self, sep: str = ..., timespec: str = ...) -> str: ...
-    else:
-        def isoformat(self, sep: str = ...) -> str: ...
+    def isoformat(self, sep: str = ...) -> str: ...
    @classmethod
    def strptime(cls, date_string: _Text, format: _Text) -> datetime: ...
    def utcoffset(self) -> Optional[timedelta]: ...
@@ -366,12 +215,8 @@ class datetime(date):
    def __lt__(self, other: datetime) -> bool: ...  # type: ignore
    def __ge__(self, other: datetime) -> bool: ...  # type: ignore
    def __gt__(self, other: datetime) -> bool: ...  # type: ignore
-    if sys.version_info >= (3, 8):
-        def __add__(self: _S, other: timedelta) -> _S: ...
-        def __radd__(self: _S, other: timedelta) -> _S: ...
-    else:
-        def __add__(self, other: timedelta) -> datetime: ...
-        def __radd__(self, other: timedelta) -> datetime: ...
+    def __add__(self, other: timedelta) -> datetime: ...
+    def __radd__(self, other: timedelta) -> datetime: ...
    @overload  # type: ignore
    def __sub__(self, other: datetime) -> timedelta: ...
    @overload
@@ -379,7 +224,4 @@ class datetime(date):
    def __hash__(self) -> int: ...
    def weekday(self) -> int: ...
    def isoweekday(self) -> int: ...
-    if sys.version_info >= (3, 9):
-        def isocalendar(self) -> _IsoCalendarDate: ...
-    else:
-        def isocalendar(self) -> Tuple[int, int, int]: ...
+    def isocalendar(self) -> Tuple[int, int, int]: ...