diff --git a/src/corelibs/string_handling/timestamp_strings.py b/src/corelibs/string_handling/timestamp_strings.py index f1ca7a1..68346de 100644 --- a/src/corelibs/string_handling/timestamp_strings.py +++ b/src/corelibs/string_handling/timestamp_strings.py @@ -23,11 +23,13 @@ class TimestampStrings: TIME_ZONE: str = 'Asia/Tokyo' - def __init__(self, time_zone: str | None = None): + def __init__(self, time_zone: str | ZoneInfo | None = None): self.timestamp_now = datetime.now() self.time_zone = time_zone if time_zone is not None else self.TIME_ZONE try: - self.timestamp_now_tz = datetime.now(ZoneInfo(self.time_zone)) + self.timestamp_now_tz = datetime.now( + ZoneInfo(self.time_zone) if not isinstance(self.time_zone, ZoneInfo) else self.time_zone + ) except ZoneInfoNotFoundError as e: raise ValueError(f'Zone could not be loaded [{self.time_zone}]: {e}') from e self.today = self.timestamp_now.strftime('%Y-%m-%d') diff --git a/test-run/config_handling/config/settings.ini b/test-run/config_handling/config/settings.ini index 4417a95..69efe5e 100644 --- a/test-run/config_handling/config/settings.ini +++ b/test-run/config_handling/config/settings.ini @@ -24,6 +24,7 @@ match_source_list=foo,bar element_a=Static energy element_b=123.5 element_c=True +elemend_d=AB:CD;EF email=foo@bar.com,other+bar-fee@domain-com.cp, email_not_mandatory= email_bad=gii@bar.com diff --git a/test-run/timestamp_strings/timestamp_strings.py b/test-run/timestamp_strings/timestamp_strings.py index 127a5df..dcf8109 100644 --- a/test-run/timestamp_strings/timestamp_strings.py +++ b/test-run/timestamp_strings/timestamp_strings.py @@ -4,10 +4,12 @@ Test for double byte format """ +from zoneinfo import ZoneInfo from corelibs.string_handling.timestamp_strings import TimestampStrings def main(): + """test""" ts = TimestampStrings() print(f"TS: {ts.timestamp_now}") @@ -16,6 +18,11 @@ def main(): except ValueError as e: print(f"Value error: {e}") + ts = TimestampStrings("Europe/Vienna") + print(f"TZ: {ts.time_zone} -> TS: {ts.timestamp_now_tz}") + ts = TimestampStrings(ZoneInfo("Europe/Vienna")) + print(f"TZ: {ts.time_zone} -> TS: {ts.timestamp_now_tz}") + if __name__ == "__main__": main() diff --git a/uv.lock b/uv.lock index eb74d11..bc1d46b 100644 --- a/uv.lock +++ b/uv.lock @@ -53,7 +53,7 @@ wheels = [ [[package]] name = "corelibs" -version = "0.23.0" +version = "0.24.1" source = { editable = "." } dependencies = [ { name = "jmespath" },