From c8092499ec566548702413ae23a8386a62f4c73d Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Mon, 1 Nov 2021 08:54:10 +0100
Subject: Remove old PyInstaller handling

See #6792 and https://github.com/pyinstaller/pyinstaller/issues/1905 (fixed in
PyInstaller 4.4)
---
 qutebrowser/extensions/loader.py     | 36 +++++-------------------------------
 qutebrowser/utils/resources.py       |  6 ------
 tests/unit/extensions/test_loader.py |  8 +-------
 3 files changed, 6 insertions(+), 44 deletions(-)

diff --git a/qutebrowser/extensions/loader.py b/qutebrowser/extensions/loader.py
index 7ae45023b..c7b619b3e 100644
--- a/qutebrowser/extensions/loader.py
+++ b/qutebrowser/extensions/loader.py
@@ -21,12 +21,11 @@
 
 import pkgutil
 import types
-import sys
 import pathlib
 import importlib
 import argparse
 import dataclasses
-from typing import Callable, Iterator, List, Optional, Set, Tuple
+from typing import Callable, Iterator, List, Optional, Tuple
 
 from PyQt5.QtCore import pyqtSlot
 
@@ -95,18 +94,6 @@ def load_components(*, skip_hooks: bool = False) -> None:
 
 def walk_components() -> Iterator[ExtensionInfo]:
     """Yield ExtensionInfo objects for all modules."""
-    if hasattr(sys, 'frozen'):
-        yield from _walk_pyinstaller()
-    else:
-        yield from _walk_normal()
-
-
-def _on_walk_error(name: str) -> None:
-    raise ImportError("Failed to import {}".format(name))
-
-
-def _walk_normal() -> Iterator[ExtensionInfo]:
-    """Walk extensions when not using PyInstaller."""
     for _finder, name, ispkg in pkgutil.walk_packages(
             # Only packages have a __path__ attribute,
             # but we're sure this is one.
@@ -123,23 +110,6 @@ def _walk_normal() -> Iterator[ExtensionInfo]:
         yield ExtensionInfo(name=name)
 
 
-def _walk_pyinstaller() -> Iterator[ExtensionInfo]:
-    """Walk extensions when using PyInstaller.
-
-    See https://github.com/pyinstaller/pyinstaller/issues/1905
-
-    Inspired by:
-    https://github.com/webcomics/dosage/blob/master/dosagelib/loader.py
-    """
-    toc: Set[str] = set()
-    for importer in pkgutil.iter_importers('qutebrowser'):
-        if hasattr(importer, 'toc'):
-            toc |= importer.toc  # type: ignore[union-attr]
-    for name in toc:
-        if name.startswith(components.__name__ + '.'):
-            yield ExtensionInfo(name=name)
-
-
 def _get_init_context() -> InitContext:
     """Get an InitContext object."""
     return InitContext(data_dir=pathlib.Path(standarddir.data()),
@@ -190,3 +160,7 @@ def _on_config_changed(changed_name: str) -> None:
 
 def init() -> None:
     config.instance.changed.connect(_on_config_changed)
+
+
+def _on_walk_error(name: str) -> None:
+    raise ImportError("Failed to import {}".format(name))
diff --git a/qutebrowser/utils/resources.py b/qutebrowser/utils/resources.py
index f561d6747..cd6284f7f 100644
--- a/qutebrowser/utils/resources.py
+++ b/qutebrowser/utils/resources.py
@@ -40,12 +40,6 @@ 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
diff --git a/tests/unit/extensions/test_loader.py b/tests/unit/extensions/test_loader.py
index feb5dd347..e9b8055aa 100644
--- a/tests/unit/extensions/test_loader.py
+++ b/tests/unit/extensions/test_loader.py
@@ -35,16 +35,10 @@ def test_on_walk_error():
 
 
 def test_walk_normal():
-    names = [info.name for info in loader._walk_normal()]
+    names = [info.name for info in loader.walk_components()]
     assert 'qutebrowser.components.scrollcommands' in names
 
 
-def test_walk_pyinstaller():
-    # We can't test whether we get something back without being frozen by
-    # PyInstaller, but at least we can test that we don't crash.
-    list(loader._walk_pyinstaller())
-
-
 def test_load_component(monkeypatch):
     monkeypatch.setattr(objects, 'commands', {})
 
-- 
cgit v1.2.3-54-g00ecf