Skip to content

correct .from_format() tz hint to match the wrapped .datetime() hint #548

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

correct .from_format() tz hint to match the wrapped .datetime() hint #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe2eec5
correct .from_format() tz hint to match the wrapped .datetime() hint
altendky Jun 12, 2023
0f47478
catch up
altendky Jun 12, 2023
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
4 changes: 2 additions & 2 deletions pendulum/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ def instance(
)


def now(tz: str | Timezone | None = None) -> DateTime:
def now(tz: str | float | Timezone | None = None) -> DateTime:
"""
Get a DateTime instance for the current date and time.
"""
Expand Down Expand Up @@ -259,7 +259,7 @@ def yesterday(tz: str | Timezone = "local") -> DateTime:
def from_format(
string: str,
fmt: str,
tz: str | Timezone = UTC,
tz: str | float | Timezone | None = UTC,
locale: str | None = None,
) -> DateTime:
"""
Expand Down
4 changes: 2 additions & 2 deletions pendulum/datetime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,12 @@ def now(cls, tz: datetime.tzinfo | None = None) -> Self:

@overload
@classmethod
def now(cls, tz: str | Timezone | FixedTimezone | None = None) -> Self:
def now(cls, tz: str | float | Timezone | FixedTimezone | None = None) -> Self:
...

@classmethod
def now(
cls, tz: str | Timezone | FixedTimezone | datetime.tzinfo | None = None
cls, tz: str | float | Timezone | FixedTimezone | datetime.tzinfo | None = None
) -> Self:
"""
Get a DateTime instance for the current date and time.
Expand Down