Revert "Remove pkg_resources special casing for PyInstaller"

This reverts commit 6bb2b082c94c96197daa3c161ec628fd18fd2041.

I guess storing package data in qutebrowser/ would be the proper way,
but this doesn't actually work on macOS - there, the executable name is
already "qutebrowser"...

1 files changed, 16 insertions, 4 deletions

diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py
index 85d1612c7..4ae0c9cab 100644
--- a/qutebrowser/utils/utils.py
+++ b/qutebrowser/utils/utils.py
@@ -208,12 +208,24 @@ def read_file(filename: str, binary: bool = False) -> Any:
     if not binary and filename in _resource_cache:
         return _resource_cache[filename]
 
-    p = importlib_resources.files(qutebrowser) / filename
+    if hasattr(sys, 'frozen'):
+        # PyInstaller doesn't support pkg_resources :(
+        # https://github.com/pyinstaller/pyinstaller/wiki/FAQ#misc
+        fn = os.path.join(os.path.dirname(sys.executable), filename)
+        if binary:
+            f: IO
+            with open(fn, 'rb') as f:
+                return f.read()
+        else:
+            with open(fn, 'r', encoding='utf-8') as f:
+                return f.read()
+    else:
+        p = importlib_resources.files(qutebrowser) / filename
 
-    if binary:
-        return p.read_bytes()
+        if binary:
+            return p.read_bytes()
 
-    return p.read_text()
+        return p.read_text()
 
 
 def resource_filename(filename: str) -> str: