mirror of
https://github.com/esphome/esphome.git
synced 2026-05-21 02:01:57 +08:00
[time] Fix lookup of top-level IANA timezone keys like UTC and GMT (#14952)
This commit is contained in:
@@ -59,15 +59,20 @@ _DST_RULE_TYPE_MAP = {
|
||||
|
||||
def _load_tzdata(iana_key: str) -> bytes | None:
|
||||
# From https://tzdata.readthedocs.io/en/latest/#examples
|
||||
if not iana_key:
|
||||
return None
|
||||
try:
|
||||
package_loc, resource = iana_key.rsplit("/", 1)
|
||||
except ValueError:
|
||||
return None
|
||||
package = "tzdata.zoneinfo." + package_loc.replace("/", ".")
|
||||
# Handle top-level timezone entries like "UTC", "GMT"
|
||||
package = "tzdata.zoneinfo"
|
||||
resource = iana_key
|
||||
else:
|
||||
package = "tzdata.zoneinfo." + package_loc.replace("/", ".")
|
||||
|
||||
try:
|
||||
return (resources.files(package) / resource).read_bytes()
|
||||
except (FileNotFoundError, ModuleNotFoundError):
|
||||
except (FileNotFoundError, ModuleNotFoundError, IsADirectoryError):
|
||||
return None
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user