diff options
Diffstat (limited to 'datetime_utils.py')
| -rw-r--r-- | datetime_utils.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/datetime_utils.py b/datetime_utils.py index 1cee516..fc1ca4e 100644 --- a/datetime_utils.py +++ b/datetime_utils.py @@ -159,9 +159,8 @@ def time_to_datetime_today(time: datetime.time) -> datetime.datetime: False """ - now = now_pacific() tz = time.tzinfo - return datetime.datetime.combine(now, time, tz) + return datetime.datetime.combine(now_pacific(), time, tz) def date_and_time_to_datetime(date: datetime.date, time: datetime.time) -> datetime.datetime: @@ -248,12 +247,12 @@ class TimeUnit(enum.IntEnum): @classmethod def is_valid(cls, value: Any): - if type(value) is int: - return value in cls._value2member_map_ - elif type(value) is TimeUnit: - return value.value in cls._value2member_map_ - elif type(value) is str: - return value in cls._member_names_ + if isinstance(value, int): + return cls(value) is not None + elif isinstance(value, TimeUnit): + return cls(value.value) is not None + elif isinstance(value, str): + return cls.__members__[value] is not None else: print(type(value)) return False @@ -508,6 +507,7 @@ def datetime_to_string( date_time_separator=date_time_separator, include_timezone=include_timezone, include_dayname=include_dayname, + use_month_abbrevs=use_month_abbrevs, include_seconds=include_seconds, include_fractional=include_fractional, twelve_hour=twelve_hour, @@ -541,6 +541,7 @@ def string_to_datetime( date_time_separator=date_time_separator, include_timezone=include_timezone, include_dayname=include_dayname, + use_month_abbrevs=use_month_abbrevs, include_seconds=include_seconds, include_fractional=include_fractional, twelve_hour=twelve_hour, |