From ed0a7534dafc3ead62fe69e3d06dcebbf6cafaf1 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 12 Sep 2022 10:50:49 +0200 Subject: snippets_translate: Use super() for base class initialization Change-Id: Ie7642f45d59839a52a650abd47383e30e508b8d3 Reviewed-by: Adrian Herrmann Reviewed-by: Cristian Maureira-Fredes (cherry picked from commit 6d76b3e6972b1ae1c897fe48707cb410995baf6b) Reviewed-by: Qt Cherry-pick Bot --- tools/snippets_translate/handlers.py | 4 ++-- 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 26633fc50..642db24cb 100644 --- a/tools/snippets_translate/handlers.py +++ b/tools/snippets_translate/handlers.py @@ -340,7 +340,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) @@ -350,7 +350,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 0057159c3..d47ab9ef2 100644 --- a/tools/snippets_translate/tests/test_converter.py +++ b/tools/snippets_translate/tests/test_converter.py @@ -326,24 +326,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" @@ -353,7 +353,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(): -- cgit v1.2.3