diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-03 18:12:01 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-06 22:07:21 +0200 |
| commit | 735d8097489f836f32f65b8ff47f3e904642faf4 (patch) | |
| tree | 42a5ae3ba757eb0b8686f0c3f98b5123f45d3b57 /examples/corelib | |
| parent | fa1a682cfdc0238a7ca10ffd45ea5f6ada4c8e7e (diff) | |
Port some examples from QRegExp to QRegularExpression
QRegExp is deprecated.
Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: I5c5dc4965a03fbd1a3370be3fa9e64c5df6a9fd8
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'examples/corelib')
| -rw-r--r-- | examples/corelib/tools/codecs/codecs.py | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/examples/corelib/tools/codecs/codecs.py b/examples/corelib/tools/codecs/codecs.py index a3c063c04..63e74a60b 100644 --- a/examples/corelib/tools/codecs/codecs.py +++ b/examples/corelib/tools/codecs/codecs.py @@ -123,7 +123,8 @@ class MainWindow(QtWidgets.QMainWindow): def findCodecs(self): codecMap = [] - iso8859RegExp = QtCore.QRegExp('ISO[- ]8859-([0-9]+).*') + iso8859RegExp = QtCore.QRegularExpression('^ISO[- ]8859-([0-9]+).*$') + assert iso8859RegExp.isValid() for mib in QtCore.QTextCodec.availableMibs(): codec = QtCore.QTextCodec.codecForMib(mib) @@ -134,13 +135,15 @@ class MainWindow(QtWidgets.QMainWindow): rank = 1 elif sortKey.startswith('UTF-16'): rank = 2 - elif iso8859RegExp.exactMatch(sortKey): - if len(iso8859RegExp.cap(1)) == 1: - rank = 3 - else: - rank = 4 else: - rank = 5 + match = iso8859RegExp.match(sortKey) + if match.hasMatch(): + if len(match.captured(1)) == 1: + rank = 3 + else: + rank = 4 + else: + rank = 5 codecMap.append((str(rank) + sortKey, codec)) |