From fe2eec5e8aa2ba88410f479d98d6274a1d2daeea Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Mon, 12 Jun 2023 09:22:59 -0400 Subject: [PATCH 1/2] correct .from_format() tz hint to match the wrapped .datetime() hint --- pendulum/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pendulum/__init__.py b/pendulum/__init__.py index 1f895512..d51b4045 100644 --- a/pendulum/__init__.py +++ b/pendulum/__init__.py @@ -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: """ From 0f4747854b1307ed51eb6b5ed182823bc57a1782 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Mon, 12 Jun 2023 09:41:02 -0400 Subject: [PATCH 2/2] catch up --- pendulum/__init__.py | 2 +- pendulum/datetime.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pendulum/__init__.py b/pendulum/__init__.py index d51b4045..d20826f2 100644 --- a/pendulum/__init__.py +++ b/pendulum/__init__.py @@ -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. """ diff --git a/pendulum/datetime.py b/pendulum/datetime.py index d265aece..6a3fdf2e 100644 --- a/pendulum/datetime.py +++ b/pendulum/datetime.py @@ -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.