diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-28 09:44:46 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-28 11:36:20 +0100 |
| commit | 0479b02b6159c189440cfe8f1c6093c8336f50c9 (patch) | |
| tree | 7b888922590186327b95903e2573e6b5b80d9d74 /tools/snippets_translate | |
| parent | 5fac301e8e5a8d15eaff91d78b5deeeb2204c7b4 (diff) | |
snippets_translate: Fix new string literals
Use a regexp to change u"s"_s to "s".
Amends 4315cfb44eaa8abd57c685390c6b9d3aff09ba0f.
Pick-to: 6.4 6.2
Task-number: PYSIDE-2151
Task-number: PYSIDE-1106
Change-Id: Id8a2cdee5966dfc4c5fbff9df6e7b9eeb7c0e436
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'tools/snippets_translate')
| -rw-r--r-- | tools/snippets_translate/handlers.py | 4 | ||||
| -rw-r--r-- | tools/snippets_translate/tests/test_converter.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/snippets_translate/handlers.py b/tools/snippets_translate/handlers.py index 6b9614880..b62f8a874 100644 --- a/tools/snippets_translate/handlers.py +++ b/tools/snippets_translate/handlers.py @@ -35,7 +35,8 @@ USELESS_QT_CLASSES_PATTERNS = [ re.compile(r'QString\.fromLatin1\(("[^"]*")\)'), re.compile(r"QLatin1Char\(('[^']*')\)"), re.compile(r'QStringLiteral\(("[^"]*")\)'), - re.compile(r'QString\.fromUtf8\(("[^"]*")\)') + re.compile(r'QString\.fromUtf8\(("[^"]*")\)'), + re.compile(r'u("[^"]*")_s') ] COMMENT1_PATTERN = re.compile(r" *# *[\w\ ]+$") COMMENT2_PATTERN = re.compile(r" *# *(.*)$") @@ -520,7 +521,6 @@ def handle_useless_qt_classes(x): x = x[0:match.start()] + match.group(1) + x[match.end():] else: break - x = x.replace('"_s', '"') # New string literals return x diff --git a/tools/snippets_translate/tests/test_converter.py b/tools/snippets_translate/tests/test_converter.py index 1be9af553..35b025881 100644 --- a/tools/snippets_translate/tests/test_converter.py +++ b/tools/snippets_translate/tests/test_converter.py @@ -373,7 +373,7 @@ def test_useless_qt_classes(): st('result = QStringLiteral("A") + QStringLiteral("B");') == 'result = "A" + "B"') assert st("<< QLatin1Char('\0') << endl;") == "print('\0')" - assert st('result = "A"_s;') == 'result = "A"' + assert st('result = u"A"_s;') == 'result = "A"' def test_special_cases(): |