Skip to content

pytz: utcoffset only returns None if dt is None #7510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 19, 2022
Merged

pytz: utcoffset only returns None if dt is None #7510

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b42a7c6
pytz: utcoffset only returns None if dt is None
JelleZijlstra Mar 17, 2022
daf0e0d
Stricter signature on the superclass
JelleZijlstra Mar 17, 2022
eecf348
no need to change the base class
JelleZijlstra Mar 19, 2022
2a5e2d1
type ignore
JelleZijlstra Mar 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions stubs/pytz/pytz/tzinfo.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import datetime
from abc import abstractmethod
from typing import Any
from typing import Any, overload

class BaseTzInfo(datetime.tzinfo):
zone: str | None # Actually None but should be set on concrete subclasses
Expand Down Expand Up @@ -31,5 +31,9 @@ class DstTzInfo(BaseTzInfo):
def localize(self, dt: datetime.datetime, is_dst: bool | None = ...) -> datetime.datetime: ...
def normalize(self, dt: datetime.datetime) -> datetime.datetime: ...
def tzname(self, dt: datetime.datetime | None, is_dst: bool | None = ...) -> str: ...
def utcoffset(self, dt: datetime.datetime | None, is_dst: bool | None = ...) -> datetime.timedelta | None: ...
# https://github.com/python/mypy/issues/12379
@overload # type: ignore[override]
def utcoffset(self, dt: None, is_dst: bool | None = ...) -> None: ...
@overload
def utcoffset(self, dt: datetime.datetime, is_dst: bool | None = ...) -> datetime.timedelta: ...
def dst(self, dt: datetime.datetime | None, is_dst: bool | None = ...) -> datetime.timedelta | None: ...