diff options
| -rwxr-xr-x | sources/shiboken6/shiboken_tool.py | 10 | ||||
| -rw-r--r-- | sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/pyi_generator.py | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/sources/shiboken6/shiboken_tool.py b/sources/shiboken6/shiboken_tool.py index e136794f7..8c7a517e5 100755 --- a/sources/shiboken6/shiboken_tool.py +++ b/sources/shiboken6/shiboken_tool.py @@ -53,10 +53,12 @@ def main(): def genpyi(): - shiboken_dir = Path(__file__).resolve().parents[2] / "shiboken6" - support = shiboken_dir / "files.dir" / "shibokensupport" - cmd = support / "signature" / "lib" / "pyi_generator.py" - command = [sys.executable, os.fspath(cmd)] + sys.argv[1:] + # After we changed the shibokensupport module to be totally virtual, + # it is no longer possible to call the pyi generator from the file system. + command = [sys.executable, "-c", + "import shiboken6;" + "from shibokensupport.signature.lib.pyi_generator import main;" + "main()"] + sys.argv[1:] sys.exit(subprocess.call(command)) diff --git a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/pyi_generator.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/pyi_generator.py index 6dfa63a6a..92153e7e4 100644 --- a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/pyi_generator.py +++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/pyi_generator.py @@ -316,7 +316,7 @@ def generate_pyi(import_name, outpath, options): subprocess.check_output([sys.executable, os.fspath(outfilepath)]) -if __name__ == "__main__": +def main(): parser = argparse.ArgumentParser( formatter_class=argparse.RawDescriptionHelpFormatter, description=dedent("""\ @@ -350,4 +350,6 @@ if __name__ == "__main__": options.logger = logger generate_pyi(module, outpath, options=options) +if __name__ == "__main__": + main() # eof |