From 457672c5900622a2f97f530e4e0769e796a47d98 Mon Sep 17 00:00:00 2001 From: un-pogaz <46523284+un-pogaz@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:50:49 +0200 Subject: [PATCH 1/2] ... --- src/qt/__main__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qt/__main__.py b/src/qt/__main__.py index 3ed8e56337..85f8ed5dc4 100644 --- a/src/qt/__main__.py +++ b/src/qt/__main__.py @@ -20,7 +20,9 @@ module_lists = { 'QtOpenGL', 'QtOpenGLWidgets', 'QtQuick', - 'QtMultimedia', 'QtMultimediaWidgets', 'QtTextToSpeech', + 'QtMultimedia', + 'QtMultimediaWidgets', + 'QtTextToSpeech', ), 'webengine': ( 'QtWebEngineCore', From 9978420463006a6720f70739c5a063759ccf1f20 Mon Sep 17 00:00:00 2001 From: un-pogaz <46523284+un-pogaz@users.noreply.github.com> Date: Wed, 4 Sep 2024 12:17:09 +0200 Subject: [PATCH 2/2] autogenerated submodules of the Qt Wrapper --- src/qt/__main__.py | 13 ++++++++++++- src/qt/core.py | 7 +------ src/qt/dbus.py | 7 +------ src/qt/webengine.py | 9 ++------- 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/qt/__main__.py b/src/qt/__main__.py index 85f8ed5dc4..a80de5a8c1 100644 --- a/src/qt/__main__.py +++ b/src/qt/__main__.py @@ -46,6 +46,17 @@ def scan(name): if not obj_name.startswith('_') and obj_name not in name_map: name_map[obj_name] = full_name types.append(f'{obj_name} = {full_name}.{obj_name}') + with open(f'{base}/{name}.py', 'w') as f: + print('# autogenerated by __main__.py do not edit', file=f) + print(f'from .{name}_name_map import module_names, name_map', file=f) + print('''from .loader import dynamic_load + +already_imported = {} +qt_modules = {} + +def __getattr__(name): + return dynamic_load(name, name_map, already_imported, qt_modules, module_names) +''', file=f) with open(f'{base}/{name}.pyi', 'w') as f: print('# autogenerated by __main__.py do not edit', file=f) f.write('\n'.join(types)) @@ -63,7 +74,7 @@ def scan(name): top_level_module_names = () -for name in ('core', 'webengine', 'dbus'): +for name in module_lists.keys(): top_level_module_names += module_lists[name] scan(name) with open(f'{base}/__init__.py', 'w') as f: diff --git a/src/qt/core.py b/src/qt/core.py index 9e6914c8a4..4ed7b878ef 100644 --- a/src/qt/core.py +++ b/src/qt/core.py @@ -1,14 +1,9 @@ -#!/usr/bin/env python -# vim:fileencoding=utf-8 -# License: GPL v3 Copyright: 2021, Kovid Goyal - - +# autogenerated by __main__.py do not edit from .core_name_map import module_names, name_map from .loader import dynamic_load already_imported = {} qt_modules = {} - def __getattr__(name): return dynamic_load(name, name_map, already_imported, qt_modules, module_names) diff --git a/src/qt/dbus.py b/src/qt/dbus.py index a00a6838c7..d72bd896db 100644 --- a/src/qt/dbus.py +++ b/src/qt/dbus.py @@ -1,14 +1,9 @@ -#!/usr/bin/env python -# vim:fileencoding=utf-8 -# License: GPL v3 Copyright: 2021, Kovid Goyal - - +# autogenerated by __main__.py do not edit from .dbus_name_map import module_names, name_map from .loader import dynamic_load already_imported = {} qt_modules = {} - def __getattr__(name): return dynamic_load(name, name_map, already_imported, qt_modules, module_names) diff --git a/src/qt/webengine.py b/src/qt/webengine.py index a6966515b6..577db517a5 100644 --- a/src/qt/webengine.py +++ b/src/qt/webengine.py @@ -1,14 +1,9 @@ -#!/usr/bin/env python -# vim:fileencoding=utf-8 -# License: GPL v3 Copyright: 2021, Kovid Goyal - - -from .loader import dynamic_load +# autogenerated by __main__.py do not edit from .webengine_name_map import module_names, name_map +from .loader import dynamic_load already_imported = {} qt_modules = {} - def __getattr__(name): return dynamic_load(name, name_map, already_imported, qt_modules, module_names)