diff --git a/contrib/build-wine/prepare-wine.sh b/contrib/build-wine/prepare-wine.sh index 14b6c69cb..c22353677 100755 --- a/contrib/build-wine/prepare-wine.sh +++ b/contrib/build-wine/prepare-wine.sh @@ -1,8 +1,8 @@ #!/bin/bash PYINSTALLER_REPO="https://github.com/pyinstaller/pyinstaller.git" -PYINSTALLER_COMMIT="413cce49ff28d87fad4472f4953489226ec90c84" -# ^ tag "v5.11.0" +PYINSTALLER_COMMIT="d1b6b520a017578a19e1cb9514752a4517755ee0" +# ^ tag "v5.13.2" PYTHON_VERSION=3.11.9 diff --git a/contrib/osx/make_osx.sh b/contrib/osx/make_osx.sh index f19174e93..9d7dff4cf 100755 --- a/contrib/osx/make_osx.sh +++ b/contrib/osx/make_osx.sh @@ -88,8 +88,8 @@ brew install autoconf automake libtool gettext coreutils pkgconfig info "Building PyInstaller." PYINSTALLER_REPO="https://github.com/pyinstaller/pyinstaller.git" -PYINSTALLER_COMMIT="413cce49ff28d87fad4472f4953489226ec90c84" -# ^ tag "v5.11.0" +PYINSTALLER_COMMIT="d1b6b520a017578a19e1cb9514752a4517755ee0" +# ^ tag "v5.13.2" ( if [ -f "$CACHEDIR/pyinstaller/PyInstaller/bootloader/Darwin-64bit/runw" ]; then info "pyinstaller already built, skipping" diff --git a/electrum/plugin.py b/electrum/plugin.py index dc990735b..5b8963f20 100644 --- a/electrum/plugin.py +++ b/electrum/plugin.py @@ -97,7 +97,7 @@ class Plugins(DaemonThread): # FIXME pyinstaller binaries are packaging each built-in plugin twice: # once as data and once as code. To honor the "no duplicates" rule below, # we exclude the ones packaged as *code*, here: - if loader.__class__.__qualname__ == "FrozenImporter": + if loader.__class__.__qualname__ == "PyiFrozenImporter": continue full_name = f'electrum.plugins.{name}' spec = importlib.util.find_spec(full_name)