Mirrors_Framework/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-06-02 03:02:19 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

[time] Fix lookup of top-level IANA timezone keys like UTC and GMT (#14952)

Browse Source
This commit is contained in:
J. Nick Koston
2026-03-19 08:44:35 -10:00
committed by GitHub
parent 63f0d054b7
commit a8ed781f3e
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/time/__init__.py
+8 -3
View File
@@ -59,15 +59,20 @@ _DST_RULE_TYPE_MAP = {
def _load_tzdata(iana_key: str) -> bytes | None: def _load_tzdata(iana_key: str) -> bytes | None:
# From https://tzdata.readthedocs.io/en/latest/#examples # From https://tzdata.readthedocs.io/en/latest/#examples
if not iana_key:
return None
try: try:
package_loc, resource = iana_key.rsplit("/", 1) package_loc, resource = iana_key.rsplit("/", 1)
except ValueError: except ValueError:
return None # Handle top-level timezone entries like "UTC", "GMT"
package = "tzdata.zoneinfo." + package_loc.replace("/", ".") package = "tzdata.zoneinfo"
resource = iana_key
else:
package = "tzdata.zoneinfo." + package_loc.replace("/", ".")
try: try:
return (resources.files(package) / resource).read_bytes() return (resources.files(package) / resource).read_bytes()
except (FileNotFoundError, ModuleNotFoundError): except (FileNotFoundError, ModuleNotFoundError, IsADirectoryError):
return None return None