From ed853a66f80dde0a6bbc48883efb835abf21e746 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 19 Oct 2020 14:58:40 +0200 Subject: [PATCH] Simplify QLocaleXmlWriter::enumData() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move the repeated List suffix to the __enumTable() helper, where half the parameter's uses were having to snip it off anyway. Change-Id: Ia396e87e59ceeb81fc4b0890a86934dc67da10cb Reviewed-by: Mårten Nordheim Reviewed-by: Cristian Maureira-Fredes --- util/locale_database/qlocalexml.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/util/locale_database/qlocalexml.py b/util/locale_database/qlocalexml.py index d8a99f3f3d3..97b369fde86 100644 --- a/util/locale_database/qlocalexml.py +++ b/util/locale_database/qlocalexml.py @@ -335,9 +335,9 @@ class QLocaleXmlWriter (object): # Output of various sections, in their usual order: def enumData(self, languages, scripts, countries): - self.__enumTable('languageList', languages) - self.__enumTable('scriptList', scripts) - self.__enumTable('countryList', countries) + self.__enumTable('language', languages) + self.__enumTable('script', scripts) + self.__enumTable('country', countries) def likelySubTags(self, entries): self.__openTag('likelySubtags') @@ -381,14 +381,14 @@ class QLocaleXmlWriter (object): raise Error('Attempted to write data after closing :-(') def __enumTable(self, tag, table): - self.__openTag(tag) + self.__openTag(tag + 'List') for key, value in table.iteritems(): - self.__openTag(tag[:-4]) + self.__openTag(tag) self.inTag('name', value[0]) self.inTag('id', key) self.inTag('code', value[1]) - self.__closeTag(tag[:-4]) - self.__closeTag(tag) + self.__closeTag(tag) + self.__closeTag(tag + 'List') def __likelySubTag(self, tag, likely): self.__openTag(tag)