diff options
| author | Florian Bruhin <me@the-compiler.org> | 2021-01-26 17:08:06 +0100 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2021-01-26 17:47:38 +0100 |
| commit | 5593c8f4117fd64328d312523f756ba9ed650822 (patch) | |
| tree | ace36fa52506e3076b018745bfca1f1963d4f8de /qutebrowser | |
| parent | 579585d55423914dc6b120b5a454000573ce67d7 (diff) | |
| download | qutebrowser-5593c8f4117fd64328d312523f756ba9ed650822.tar.gz qutebrowser-5593c8f4117fd64328d312523f756ba9ed650822.zip | |
Finish dropping pkg_resources
Closes #4467
Diffstat (limited to 'qutebrowser')
| -rw-r--r-- | qutebrowser/misc/earlyinit.py | 1 | ||||
| -rw-r--r-- | qutebrowser/utils/utils.py | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py index 1938a8361..d871423f7 100644 --- a/qutebrowser/misc/earlyinit.py +++ b/qutebrowser/misc/earlyinit.py @@ -224,7 +224,6 @@ def _check_modules(modules): def check_libraries(): """Check if all needed Python libraries are installed.""" modules = { - 'pkg_resources': _missing_str("pkg_resources/setuptools"), 'jinja2': _missing_str("jinja2"), 'yaml': _missing_str("PyYAML"), 'dataclasses': _missing_str("dataclasses"), diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py index bd22101de..483a9a6f3 100644 --- a/qutebrowser/utils/utils.py +++ b/qutebrowser/utils/utils.py @@ -208,8 +208,8 @@ def read_file(filename: str, binary: bool = False) -> Any: return _resource_cache[filename] if hasattr(sys, 'frozen'): - # PyInstaller doesn't support pkg_resources :( - # https://github.com/pyinstaller/pyinstaller/wiki/FAQ#misc + # For PyInstaller, where we can't store resource files in a qutebrowser/ folder + # because the executable is already named "qutebrowser" (at least on macOS). fn = os.path.join(os.path.dirname(sys.executable), filename) if binary: f: IO |