From 32820ca5dde7bef90f58f6984256e84fbaabff16 Mon Sep 17 00:00:00 2001 From: Yuval Adam <_@yuv.al> Date: Sun, 16 May 2021 18:06:07 +0300 Subject: Cleanup group areas --- alarmpy/alarmpy.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/alarmpy/alarmpy.py b/alarmpy/alarmpy.py index 90122b7..0edec3a 100644 --- a/alarmpy/alarmpy.py +++ b/alarmpy/alarmpy.py @@ -134,12 +134,8 @@ class Alarm: def group_areas_and_localize(self, cities): res = defaultdict(list) for city in cities: - try: - area = self.labels[city][f"areaname_{self.language}"] - label = self.labels[city][f"label_{self.language}"] - except KeyError: - area = "" - label = city + area = self.labels.get(city, {}).get(f"areaname_{self.language}", "") + label = self.labels.get(city, {}).get(f"label_{self.language}", city) res[area].append(label) return res -- cgit v1.3.1