From 78ac4b40a5da489036885def98e5108fdd56cdbc Mon Sep 17 00:00:00 2001 From: Jaime Resano Date: Fri, 22 Nov 2024 16:59:05 +0100 Subject: Deployment: Fix crash when from . import x is used When ast library parses a "from . import x" statement, it will return a module name of None. Therefore, using .startswith() on None will raise an exception. Task-number: PYSIDE-1612 Pick-to: 6.8 Change-Id: I6532f4ebc469695ee977840c3cb40f641fb3cdb6 Reviewed-by: Jaime Resano Reviewed-by: Friedemann Kleint --- sources/pyside-tools/deploy_lib/dependency_util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sources/pyside-tools/deploy_lib/dependency_util.py') diff --git a/sources/pyside-tools/deploy_lib/dependency_util.py b/sources/pyside-tools/deploy_lib/dependency_util.py index af7a604d5..e99d654c7 100644 --- a/sources/pyside-tools/deploy_lib/dependency_util.py +++ b/sources/pyside-tools/deploy_lib/dependency_util.py @@ -143,7 +143,7 @@ def find_pyside_modules(project_dir: Path, extra_ignore_dirs: list[Path] = None, for node in ast.walk(tree): if isinstance(node, ast.ImportFrom): main_mod_name = node.module - if main_mod_name.startswith("PySide6"): + if main_mod_name and main_mod_name.startswith("PySide6"): if main_mod_name == "PySide6": # considers 'from PySide6 import QtCore' for imported_module in node.names: -- cgit v1.2.3