locale_database: Don't use u prefix for strings in python files

This prefix is useless with Python 3.

Task-number: QTBUG-83488
Pick-to: 6.2
Change-Id: Ic008d53fe506865759e9a5003f439f7ac107b9e6
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

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: