diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-09-12 10:50:49 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-09-12 14:29:18 +0200 |
| commit | 6d76b3e6972b1ae1c897fe48707cb410995baf6b (patch) | |
| tree | 4d2bc8aa5340128d3d69afe59bbf023cd8d07630 | |
| parent | 888b78ad9a2ddebaceda76b3d8f6cc80567b623f (diff) | |
snippets_translate: Use super() for base class initialization
Pick-to: 6.3
Change-Id: Ie7642f45d59839a52a650abd47383e30e508b8d3
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| -rw-r--r-- | tools/snippets_translate/handlers.py | 4 | ||||
| -rw-r--r-- | tools/snippets_translate/tests/test_converter.py | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tools/snippets_translate/handlers.py b/tools/snippets_translate/handlers.py index beb956c20..05c3cfba1 100644 --- a/tools/snippets_translate/handlers.py +++ b/tools/snippets_translate/handlers.py @@ -304,7 +304,7 @@ def handle_constructor_default_values(x): if arg.startswith("Q"): class_name = arg.split("(")[0] content = arg.replace(class_name, "")[1:-1] - return_values += f" {class_name}.__init__(self, {content})\n" + return_values += f" super().__init__({content})\n" elif arg: var_name = arg.split("(")[0] content = PARENTHESES_NONEMPTY_CONTENT_PATTERN.search(arg).group(1) @@ -314,7 +314,7 @@ def handle_constructor_default_values(x): if arg.startswith("Q"): class_name = arg.split("(")[0] content = arg.replace(class_name, "")[1:-1] - return f" {class_name}.__init__(self, {content})" + return f" super().__init__({content})" elif arg: var_name = arg.split("(")[0] match = PARENTHESES_NONEMPTY_CONTENT_PATTERN.search(arg) diff --git a/tools/snippets_translate/tests/test_converter.py b/tools/snippets_translate/tests/test_converter.py index 7a04f398f..3c7ed7b70 100644 --- a/tools/snippets_translate/tests/test_converter.py +++ b/tools/snippets_translate/tests/test_converter.py @@ -290,24 +290,24 @@ def test_constuctors(): def test_inheritance_init(): assert ( st(": QClass(fun(re, 1, 2), parent), a(1)") - == " QClass.__init__(self, fun(re, 1, 2), parent)\n self.a = 1" + == " super().__init__(fun(re, 1, 2), parent)\n self.a = 1" ) assert ( st(": QQmlNdefRecord(copyFooRecord(record), parent)") - == " QQmlNdefRecord.__init__(self, copyFooRecord(record), parent)" + == " super().__init__(copyFooRecord(record), parent)" ) assert ( st(" : QWidget(parent), helper(helper)") - == " QWidget.__init__(self, parent)\n self.helper = helper" + == " super().__init__(parent)\n self.helper = helper" ) - assert st(" : QWidget(parent)") == " QWidget.__init__(self, parent)" + assert st(" : QWidget(parent)") == " super().__init__(parent)" assert ( st(": a(0), bB(99), cC2(1), p_S(10),") == " self.a = 0\n self.bB = 99\n self.cC2 = 1\n self.p_S = 10" ) assert ( st(": QAbstractFileEngineIterator(nameFilters, filters), index(0) ") - == " QAbstractFileEngineIterator.__init__(self, nameFilters, filters)\n self.index = 0" + == " super().__init__(nameFilters, filters)\n self.index = 0" ) assert ( st(": m_document(doc), m_text(text)") == " self.m_document = doc\n self.m_text = text" @@ -317,7 +317,7 @@ def test_inheritance_init(): st(": option->palette.color(QPalette::Mid);") == " self.option.palette.color = QPalette.Mid" ) - assert st(": QSqlResult(driver) {}") == " QSqlResult.__init__(self, driver)" + assert st(": QSqlResult(driver) {}") == " super().__init__(driver)" def test_arrays(): |