Bring back PyInstaller resource handling

Seems to be still needed, at least on macOS. Otherwise, we get a
NotADirectoryError trying to load resources from a weird path under the
qutebrowser executable.

See #6792

1 files changed, 6 insertions, 0 deletions

diff --git a/qutebrowser/utils/resources.py b/qutebrowser/utils/resources.py
index cd6284f7f..f561d6747 100644
--- a/qutebrowser/utils/resources.py
+++ b/qutebrowser/utils/resources.py
@@ -40,6 +40,12 @@ def _path(filename: str) -> pathlib.Path:
     """Get a pathlib.Path object for a resource."""
     assert not posixpath.isabs(filename), filename
     assert os.path.pardir not in filename.split(posixpath.sep), filename
+
+    if hasattr(sys, 'frozen'):
+        # For PyInstaller, where we can't store resource files in a qutebrowser/ folder
+        # because the executable is already named "qutebrowser" (at least on macOS).
+        return pathlib.Path(sys.executable).parent / filename
+
     return importlib_resources.files(qutebrowser) / filename
 
 @contextlib.contextmanager