From af4bccb56211f56f88aa6b34442c434d70eafa40 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Tue, 23 Jan 2024 21:16:32 +0100 Subject: [PATCH] Move special-case LDML value to a module global Giving it a symbolic name is clearer (and saves me the need to duplicate the comment when I add some more references to it). This amends commit bcdd51cfae24731a73d008add23d3c1e85bbd8d0 Pick-to: 6.5 Task-number: QTBUG-115158 Change-Id: I7577e0cde783fcda840009c7aea46934964c6e4c Reviewed-by: Cristian Maureira-Fredes (cherry picked from commit 0f770b0b34bcb5fa0a598b2ff76fe215fbc25f5c) --- util/locale_database/ldml.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/util/locale_database/ldml.py b/util/locale_database/ldml.py index 2a029ce98b6..8c622ea94ae 100644 --- a/util/locale_database/ldml.py +++ b/util/locale_database/ldml.py @@ -21,6 +21,9 @@ See individual classes for further detail. from localetools import Error from dateconverter import convert_date +# The github version of CLDR uses '↑↑↑' to indicate "inherit" +INHERIT = '↑↑↑' + class Node (object): """Wrapper for an arbitrary DOM node. @@ -205,8 +208,7 @@ class LocaleScanner (object): try: if draft is None or elt.draft <= draft: value = elt.dom.firstChild.nodeValue - # The github version of CLDR uses '↑↑↑' to indicate "inherit" - if value != '↑↑↑': + if value != INHERIT: return value except (AttributeError, KeyError): pass