From 99dc0c73b6a213aa3164a4719ed851dc514519c1 Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Wed, 30 Mar 2016 17:40:14 +0300 Subject: [PATCH] Embetter measurement system parsing: * Refactor into a separate function * Use `_import_type_text` when importing measurement systems --- scripts/import_cldr.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py index ff66738d..c3a5e596 100755 --- a/scripts/import_cldr.py +++ b/scripts/import_cldr.py @@ -422,6 +422,7 @@ def _process_local_datas(sup, srcdir, destdir, force=False, dump_json=False): parse_unit_patterns(data, tree) parse_date_fields(data, tree) parse_character_order(data, tree) + parse_measurement_systems(data, tree) write_datafile(data_filename, data, dump_json=dump_json) @@ -481,10 +482,6 @@ def parse_locale_display_names(data, tree): for listPattern in listType.findall('listPatternPart'): list_patterns[listPattern.attrib['type']] = _text(listPattern) - measurement_systems = data.setdefault('measurement_systems', {}) - for measurement_system in tree.findall('.//measurementSystemNames/measurementSystemName'): - measurement_systems[measurement_system.attrib['type']] = _text(measurement_system) - def parse_dates(data, tree, sup, regions, territory): week_data = data.setdefault('week_data', {}) @@ -849,6 +846,14 @@ def parse_character_order(data, tree): data['character_order'] = elem.text +def parse_measurement_systems(data, tree): + measurement_systems = data.setdefault('measurement_systems', {}) + for measurement_system in tree.findall('.//measurementSystemNames/measurementSystemName'): + type = measurement_system.attrib['type'] + if not _should_skip_elem(measurement_system, type=type, dest=measurement_systems): + _import_type_text(measurement_systems, measurement_system, type=type) + + if __name__ == '__main__': main() -- 2.47.2