From 87bab018a1003ca32524c7d98bffea112b9d4fca Mon Sep 17 00:00:00 2001 From: benselme Date: Sun, 11 Jan 2015 11:55:24 -0500 Subject: [PATCH] Don't try and import deprecated BCP-47 timezones --- scripts/import_cldr.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py index 63780412..7dcd171c 100755 --- a/scripts/import_cldr.py +++ b/scripts/import_cldr.py @@ -163,13 +163,14 @@ def main(): for key_elem in bcp47_timezone.findall('.//keyword/key'): if key_elem.attrib['name'] == 'tz': for elem in key_elem.findall('type'): - aliases = text_type(elem.attrib['alias']).split() - tzid = aliases.pop(0) - territory = _zone_territory_map.get(tzid, '001') - territory_zones.setdefault(territory, []).append(tzid) - zone_territories[tzid] = territory - for alias in aliases: - zone_aliases[alias] = tzid + if 'deprecated' not in elem.attrib: + aliases = text_type(elem.attrib['alias']).split() + tzid = aliases.pop(0) + territory = _zone_territory_map.get(tzid, '001') + territory_zones.setdefault(territory, []).append(tzid) + zone_territories[tzid] = territory + for alias in aliases: + zone_aliases[alias] = tzid break # Import Metazone mapping -- 2.47.2