diff options
author | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2021-07-05 18:04:41 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-15 19:19:18 +0000 |
commit | 5ca8fe9478e8e2b63db44b9d8abae71bad87d94c (patch) | |
tree | e00df74026808e52fd15c2f8477c2135bdb53cab /util/locale_database/cldr.py | |
parent | e3b20362d1df2e845ee02ac3ca0467444882a359 (diff) |
locale_database: Don't use u prefix for strings in python files
This prefix is useless with Python 3.
Task-number: QTBUG-83488
Change-Id: Ic008d53fe506865759e9a5003f439f7ac107b9e6
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 53382b7b07b136c6550b0c74a0c5769b8158d4ab)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'util/locale_database/cldr.py')
-rw-r--r-- | util/locale_database/cldr.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/util/locale_database/cldr.py b/util/locale_database/cldr.py index e3cbf2d2b6..682e595304 100644 --- a/util/locale_database/cldr.py +++ b/util/locale_database/cldr.py @@ -309,7 +309,7 @@ class CldrAccess (object): def numberSystem(self, system): """Get a description of a numbering system. - Returns a mapping, with keys u'digits', u'type' and u'id'; the + Returns a mapping, with keys 'digits', 'type' and 'id'; the value for this last is system. Raises KeyError for unknown number system, ldml.Error on failure to load data.""" try: @@ -371,7 +371,7 @@ class CldrAccess (object): text = '{} code {}'.format(key, value) name = naming.get(value) if name and value != 'POSIX': - text += u' (could add {})'.format(name) + text += ' (could add {})'.format(name) parts.append(text) if len(parts) > 1: parts[-1] = 'and ' + parts[-1] @@ -381,10 +381,10 @@ class CldrAccess (object): @staticmethod def __checkEnum(given, proper, scraps, - remap = { u'å': 'a', u'ã': 'a', u'ç': 'c', u'é': 'e', u'í': 'i', u'ü': 'u'}, + remap = { 'å': 'a', 'ã': 'a', 'ç': 'c', 'é': 'e', 'í': 'i', 'ü': 'u'}, prefix = { 'St.': 'Saint', 'U.S.': 'United States' }, suffixes = ( 'Han', ), - skip = u'\u02bc'): + skip = '\u02bc'): # Each is a { code: full name } mapping for code, name in given.items(): try: right = proper[code] @@ -484,7 +484,7 @@ enumdata.py (keeping the old name as an alias): key = 0 data['windowsKey'] = key - if code == u'001': + if code == '001': defaults[key] = data['ianaList'] else: try: |