From 21c7110ee79f355d6a42da0a274d2426b1e18665 Mon Sep 17 00:00:00 2001 From: Patrik Dufresne Date: Thu, 21 Mar 2024 14:00:30 -0400 Subject: [PATCH] Fix PyInstaller hooks to work with v6.x.x #8653 --- kivy/tools/packaging/pyinstaller_hooks/__init__.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/kivy/tools/packaging/pyinstaller_hooks/__init__.py b/kivy/tools/packaging/pyinstaller_hooks/__init__.py index 7118555976..a6a68c1b76 100644 --- a/kivy/tools/packaging/pyinstaller_hooks/__init__.py +++ b/kivy/tools/packaging/pyinstaller_hooks/__init__.py @@ -78,7 +78,12 @@ except ImportError: kivy_deps = None from kivy.factory import Factory -from PyInstaller.depend import bindepend +try: + # Pyinstaller >= 6 + from PyInstaller.depend.bindepend import get_imports +except ImportError: + # Pyinstaller < 6 + from PyInstaller.depend.bindepend import selectImports as get_imports from os import environ if 'KIVY_DOC' not in environ: @@ -367,7 +372,7 @@ def _find_gst_binaries(): lib_filepaths = set() for plugin_filepath in plugin_filepaths: - plugin_deps = bindepend.selectImports(plugin_filepath) + plugin_deps = get_imports(plugin_filepath) lib_filepaths.update([path for _, path in plugin_deps]) plugin_binaries = [(f, 'gst-plugins') for f in plugin_filepaths]