Big diff: Use new "|" union syntax (#5872)

stubs/python-dateutil/dateutil/_common.pyi

@@ -1,9 +1,9 @@
-from typing import Optional, TypeVar
+from typing import TypeVar
 
 _T = TypeVar("_T")
 
 class weekday(object):
-    def __init__(self, weekday: int, n: Optional[int] = ...) -> None: ...
+    def __init__(self, weekday: int, n: int | None = ...) -> None: ...
     def __call__(self: _T, n: int) -> _T: ...
     def __eq__(self, other: object) -> bool: ...
     def __repr__(self) -> str: ...

stubs/python-dateutil/dateutil/parser.pyi

@@ -1,5 +1,5 @@
 from datetime import datetime, tzinfo
-from typing import IO, Any, Dict, List, Mapping, Optional, Text, Tuple, Union
+from typing import IO, Any, Dict, List, Mapping, Text, Tuple, Union
 
 _FileOrStr = Union[bytes, Text, IO[str], IO[Any]]
 
@@ -14,32 +14,32 @@ class parserinfo(object):
     TZOFFSET: Dict[str, int]
     def __init__(self, dayfirst: bool = ..., yearfirst: bool = ...) -> None: ...
     def jump(self, name: Text) -> bool: ...
-    def weekday(self, name: Text) -> Optional[int]: ...
-    def month(self, name: Text) -> Optional[int]: ...
-    def hms(self, name: Text) -> Optional[int]: ...
-    def ampm(self, name: Text) -> Optional[int]: ...
+    def weekday(self, name: Text) -> int | None: ...
+    def month(self, name: Text) -> int | None: ...
+    def hms(self, name: Text) -> int | None: ...
+    def ampm(self, name: Text) -> int | None: ...
     def pertain(self, name: Text) -> bool: ...
     def utczone(self, name: Text) -> bool: ...
-    def tzoffset(self, name: Text) -> Optional[int]: ...
+    def tzoffset(self, name: Text) -> int | None: ...
     def convertyear(self, year: int) -> int: ...
     def validate(self, res: datetime) -> bool: ...
 
 class parser(object):
-    def __init__(self, info: Optional[parserinfo] = ...) -> None: ...
+    def __init__(self, info: parserinfo | None = ...) -> None: ...
     def parse(
         self,
         timestr: _FileOrStr,
-        default: Optional[datetime] = ...,
+        default: datetime | None = ...,
         ignoretz: bool = ...,
-        tzinfos: Optional[Mapping[Text, tzinfo]] = ...,
+        tzinfos: Mapping[Text, tzinfo] | None = ...,
         **kwargs: Any,
     ) -> datetime: ...
 
-def isoparse(dt_str: Union[str, bytes, IO[str], IO[bytes]]) -> datetime: ...
+def isoparse(dt_str: str | bytes | IO[str] | IO[bytes]) -> datetime: ...
 
 DEFAULTPARSER: parser
 
-def parse(timestr: _FileOrStr, parserinfo: Optional[parserinfo] = ..., **kwargs: Any) -> datetime: ...
+def parse(timestr: _FileOrStr, parserinfo: parserinfo | None = ..., **kwargs: Any) -> datetime: ...
 
 class _tzparser: ...
 

stubs/python-dateutil/dateutil/relativedelta.pyi

@@ -1,5 +1,5 @@
 from datetime import date, datetime, timedelta
-from typing import Optional, SupportsFloat, TypeVar, Union, overload
+from typing import SupportsFloat, TypeVar, overload
 
 from ._common import weekday
 
@@ -25,37 +25,37 @@ class relativedelta(object):
     minutes: int
     seconds: int
     microseconds: int
-    year: Optional[int]
-    month: Optional[int]
-    weekday: Optional[_weekday]
-    day: Optional[int]
-    hour: Optional[int]
-    minute: Optional[int]
-    second: Optional[int]
-    microsecond: Optional[int]
+    year: int | None
+    month: int | None
+    weekday: _weekday | None
+    day: int | None
+    hour: int | None
+    minute: int | None
+    second: int | None
+    microsecond: int | None
     def __init__(
         self,
-        dt1: Optional[date] = ...,
-        dt2: Optional[date] = ...,
-        years: Optional[int] = ...,
-        months: Optional[int] = ...,
-        days: Optional[int] = ...,
-        leapdays: Optional[int] = ...,
-        weeks: Optional[int] = ...,
-        hours: Optional[int] = ...,
-        minutes: Optional[int] = ...,
-        seconds: Optional[int] = ...,
-        microseconds: Optional[int] = ...,
-        year: Optional[int] = ...,
-        month: Optional[int] = ...,
-        day: Optional[int] = ...,
-        weekday: Optional[Union[int, _weekday]] = ...,
-        yearday: Optional[int] = ...,
-        nlyearday: Optional[int] = ...,
-        hour: Optional[int] = ...,
-        minute: Optional[int] = ...,
-        second: Optional[int] = ...,
-        microsecond: Optional[int] = ...,
+        dt1: date | None = ...,
+        dt2: date | None = ...,
+        years: int | None = ...,
+        months: int | None = ...,
+        days: int | None = ...,
+        leapdays: int | None = ...,
+        weeks: int | None = ...,
+        hours: int | None = ...,
+        minutes: int | None = ...,
+        seconds: int | None = ...,
+        microseconds: int | None = ...,
+        year: int | None = ...,
+        month: int | None = ...,
+        day: int | None = ...,
+        weekday: int | _weekday | None = ...,
+        yearday: int | None = ...,
+        nlyearday: int | None = ...,
+        hour: int | None = ...,
+        minute: int | None = ...,
+        second: int | None = ...,
+        microsecond: int | None = ...,
     ) -> None: ...
     @property
     def weeks(self) -> int: ...

stubs/python-dateutil/dateutil/rrule.pyi

@@ -1,5 +1,5 @@
 import datetime
-from typing import Any, Iterable, Optional, Union
+from typing import Any, Iterable
 
 from ._common import weekday as weekdaybase
 
@@ -29,28 +29,28 @@ class rrulebase:
     def count(self): ...
     def before(self, dt, inc: bool = ...): ...
     def after(self, dt, inc: bool = ...): ...
-    def xafter(self, dt, count: Optional[Any] = ..., inc: bool = ...): ...
+    def xafter(self, dt, count: Any | None = ..., inc: bool = ...): ...
     def between(self, after, before, inc: bool = ..., count: int = ...): ...
 
 class rrule(rrulebase):
     def __init__(
         self,
         freq,
-        dtstart: Optional[datetime.date] = ...,
+        dtstart: datetime.date | None = ...,
         interval: int = ...,
-        wkst: Optional[Union[weekday, int]] = ...,
-        count: Optional[int] = ...,
-        until: Optional[Union[datetime.date, int]] = ...,
-        bysetpos: Optional[Union[int, Iterable[int]]] = ...,
-        bymonth: Optional[Union[int, Iterable[int]]] = ...,
-        bymonthday: Optional[Union[int, Iterable[int]]] = ...,
-        byyearday: Optional[Union[int, Iterable[int]]] = ...,
-        byeaster: Optional[Union[int, Iterable[int]]] = ...,
-        byweekno: Optional[Union[int, Iterable[int]]] = ...,
-        byweekday: Optional[Union[int, weekday, Iterable[int], Iterable[weekday]]] = ...,
-        byhour: Optional[Union[int, Iterable[int]]] = ...,
-        byminute: Optional[Union[int, Iterable[int]]] = ...,
-        bysecond: Optional[Union[int, Iterable[int]]] = ...,
+        wkst: weekday | int | None = ...,
+        count: int | None = ...,
+        until: datetime.date | int | None = ...,
+        bysetpos: int | Iterable[int] | None = ...,
+        bymonth: int | Iterable[int] | None = ...,
+        bymonthday: int | Iterable[int] | None = ...,
+        byyearday: int | Iterable[int] | None = ...,
+        byeaster: int | Iterable[int] | None = ...,
+        byweekno: int | Iterable[int] | None = ...,
+        byweekday: int | weekday | Iterable[int] | Iterable[weekday] | None = ...,
+        byhour: int | Iterable[int] | None = ...,
+        byminute: int | Iterable[int] | None = ...,
+        bysecond: int | Iterable[int] | None = ...,
         cache: bool = ...,
     ) -> None: ...
     def replace(self, **kwargs): ...

stubs/python-dateutil/dateutil/tz/_common.pyi

@@ -1,5 +1,5 @@
 from datetime import datetime, timedelta, tzinfo
-from typing import Any, Optional
+from typing import Any
 
 def tzname_in_python2(namefunc): ...
 def enfold(dt: datetime, fold: int = ...): ...
@@ -14,9 +14,9 @@ class _tzinfo(tzinfo):
 
 class tzrangebase(_tzinfo):
     def __init__(self) -> None: ...
-    def utcoffset(self, dt: Optional[datetime]) -> Optional[timedelta]: ...
-    def dst(self, dt: Optional[datetime]) -> Optional[timedelta]: ...
-    def tzname(self, dt: Optional[datetime]) -> str: ...
+    def utcoffset(self, dt: datetime | None) -> timedelta | None: ...
+    def dst(self, dt: datetime | None) -> timedelta | None: ...
+    def tzname(self, dt: datetime | None) -> str: ...
     def fromutc(self, dt: datetime) -> datetime: ...
     def is_ambiguous(self, dt: datetime) -> bool: ...
     __hash__: Any

stubs/python-dateutil/dateutil/tz/tz.pyi

@@ -1,5 +1,5 @@
 import datetime
-from typing import IO, Any, List, Optional, Text, Tuple, Union
+from typing import IO, Any, List, Text, Tuple, Union
 
 from ..relativedelta import relativedelta
 from ._common import _tzinfo as _tzinfo, enfold as enfold, tzname_in_python2 as tzname_in_python2, tzrangebase as tzrangebase
@@ -11,10 +11,10 @@ EPOCH: datetime.datetime
 EPOCHORDINAL: int
 
 class tzutc(datetime.tzinfo):
-    def utcoffset(self, dt: Optional[datetime.datetime]) -> Optional[datetime.timedelta]: ...
-    def dst(self, dt: Optional[datetime.datetime]) -> Optional[datetime.timedelta]: ...
-    def tzname(self, dt: Optional[datetime.datetime]) -> str: ...
-    def is_ambiguous(self, dt: Optional[datetime.datetime]) -> bool: ...
+    def utcoffset(self, dt: datetime.datetime | None) -> datetime.timedelta | None: ...
+    def dst(self, dt: datetime.datetime | None) -> datetime.timedelta | None: ...
+    def tzname(self, dt: datetime.datetime | None) -> str: ...
+    def is_ambiguous(self, dt: datetime.datetime | None) -> bool: ...
     def __eq__(self, other): ...
     __hash__: Any
     def __ne__(self, other): ...
@@ -22,10 +22,10 @@ class tzutc(datetime.tzinfo):
 
 class tzoffset(datetime.tzinfo):
     def __init__(self, name, offset) -> None: ...
-    def utcoffset(self, dt: Optional[datetime.datetime]) -> Optional[datetime.timedelta]: ...
-    def dst(self, dt: Optional[datetime.datetime]) -> Optional[datetime.timedelta]: ...
-    def is_ambiguous(self, dt: Optional[datetime.datetime]) -> bool: ...
-    def tzname(self, dt: Optional[datetime.datetime]) -> str: ...
+    def utcoffset(self, dt: datetime.datetime | None) -> datetime.timedelta | None: ...
+    def dst(self, dt: datetime.datetime | None) -> datetime.timedelta | None: ...
+    def is_ambiguous(self, dt: datetime.datetime | None) -> bool: ...
+    def tzname(self, dt: datetime.datetime | None) -> str: ...
     def __eq__(self, other): ...
     __hash__: Any
     def __ne__(self, other): ...
@@ -35,10 +35,10 @@ class tzoffset(datetime.tzinfo):
 
 class tzlocal(_tzinfo):
     def __init__(self) -> None: ...
-    def utcoffset(self, dt: Optional[datetime.datetime]) -> Optional[datetime.timedelta]: ...
-    def dst(self, dt: Optional[datetime.datetime]) -> Optional[datetime.timedelta]: ...
-    def tzname(self, dt: Optional[datetime.datetime]) -> str: ...
-    def is_ambiguous(self, dt: Optional[datetime.datetime]) -> bool: ...
+    def utcoffset(self, dt: datetime.datetime | None) -> datetime.timedelta | None: ...
+    def dst(self, dt: datetime.datetime | None) -> datetime.timedelta | None: ...
+    def tzname(self, dt: datetime.datetime | None) -> str: ...
+    def is_ambiguous(self, dt: datetime.datetime | None) -> bool: ...
     def __eq__(self, other): ...
     __hash__: Any
     def __ne__(self, other): ...
@@ -51,11 +51,11 @@ class _ttinfo:
     def __ne__(self, other): ...
 
 class tzfile(_tzinfo):
-    def __init__(self, fileobj: _FileObj, filename: Optional[Text] = ...) -> None: ...
-    def is_ambiguous(self, dt: Optional[datetime.datetime], idx: Optional[int] = ...) -> bool: ...
-    def utcoffset(self, dt: Optional[datetime.datetime]) -> Optional[datetime.timedelta]: ...
-    def dst(self, dt: Optional[datetime.datetime]) -> Optional[datetime.timedelta]: ...
-    def tzname(self, dt: Optional[datetime.datetime]) -> str: ...
+    def __init__(self, fileobj: _FileObj, filename: Text | None = ...) -> None: ...
+    def is_ambiguous(self, dt: datetime.datetime | None, idx: int | None = ...) -> bool: ...
+    def utcoffset(self, dt: datetime.datetime | None) -> datetime.timedelta | None: ...
+    def dst(self, dt: datetime.datetime | None) -> datetime.timedelta | None: ...
+    def tzname(self, dt: datetime.datetime | None) -> str: ...
     def __eq__(self, other): ...
     __hash__: Any
     def __ne__(self, other): ...
@@ -67,35 +67,35 @@ class tzrange(tzrangebase):
     def __init__(
         self,
         stdabbr: Text,
-        stdoffset: Union[int, datetime.timedelta, None] = ...,
-        dstabbr: Optional[Text] = ...,
-        dstoffset: Union[int, datetime.timedelta, None] = ...,
-        start: Optional[relativedelta] = ...,
-        end: Optional[relativedelta] = ...,
+        stdoffset: int | datetime.timedelta | None = ...,
+        dstabbr: Text | None = ...,
+        dstoffset: int | datetime.timedelta | None = ...,
+        start: relativedelta | None = ...,
+        end: relativedelta | None = ...,
     ) -> None: ...
     def transitions(self, year: int) -> Tuple[datetime.datetime, datetime.datetime]: ...
     def __eq__(self, other): ...
 
 class tzstr(tzrange):
     hasdst: bool
-    def __init__(self, s: Union[bytes, _FileObj], posix_offset: bool = ...) -> None: ...
+    def __init__(self, s: bytes | _FileObj, posix_offset: bool = ...) -> None: ...
     @classmethod
     def instance(cls, name, offset) -> tzoffset: ...
 
 class tzical:
     def __init__(self, fileobj: _FileObj) -> None: ...
     def keys(self): ...
-    def get(self, tzid: Optional[Any] = ...): ...
+    def get(self, tzid: Any | None = ...): ...
 
 TZFILES: List[str]
 TZPATHS: List[str]
 
-def datetime_exists(dt: datetime.datetime, tz: Optional[datetime.tzinfo] = ...) -> bool: ...
-def datetime_ambiguous(dt: datetime.datetime, tz: Optional[datetime.tzinfo] = ...) -> bool: ...
+def datetime_exists(dt: datetime.datetime, tz: datetime.tzinfo | None = ...) -> bool: ...
+def datetime_ambiguous(dt: datetime.datetime, tz: datetime.tzinfo | None = ...) -> bool: ...
 def resolve_imaginary(dt: datetime.datetime) -> datetime.datetime: ...
 
 class _GetTZ:
-    def __call__(self, name: Optional[Text] = ...) -> Optional[datetime.tzinfo]: ...
-    def nocache(self, name: Optional[Text]) -> Optional[datetime.tzinfo]: ...
+    def __call__(self, name: Text | None = ...) -> datetime.tzinfo | None: ...
+    def nocache(self, name: Text | None) -> datetime.tzinfo | None: ...
 
 gettz: _GetTZ

stubs/python-dateutil/dateutil/utils.pyi

@@ -1,6 +1,5 @@
 from datetime import datetime, timedelta, tzinfo
-from typing import Optional
 
 def default_tzinfo(dt: datetime, tzinfo: tzinfo) -> datetime: ...
-def today(tzinfo: Optional[tzinfo] = ...) -> datetime: ...
+def today(tzinfo: tzinfo | None = ...) -> datetime: ...
 def within_delta(dt1: datetime, dt2: datetime, delta: timedelta) -> bool: ...