diff options
| author | Florian Bruhin <me@the-compiler.org> | 2021-01-26 11:13:41 +0100 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2021-01-26 11:13:41 +0100 |
| commit | 6bb2b082c94c96197daa3c161ec628fd18fd2041 (patch) | |
| tree | 715e30029570e8bb8f0c3ee96322ac15aa51a00d | |
| parent | 2f918b98769bd9dbaf263e810e9cc79567cfbee3 (diff) | |
| download | qutebrowser-6bb2b082c94c96197daa3c161ec628fd18fd2041.tar.gz qutebrowser-6bb2b082c94c96197daa3c161ec628fd18fd2041.zip | |
Remove pkg_resources special casing for PyInstaller
See #4467
| -rw-r--r-- | misc/qutebrowser.spec | 15 | ||||
| -rw-r--r-- | qutebrowser/utils/utils.py | 20 |
2 files changed, 12 insertions, 23 deletions
diff --git a/misc/qutebrowser.spec b/misc/qutebrowser.spec index ffb17d371..f7cff99f2 100644 --- a/misc/qutebrowser.spec +++ b/misc/qutebrowser.spec @@ -13,16 +13,17 @@ block_cipher = None def get_data_files(): data_files = [ - ('../qutebrowser/html', 'html'), - ('../qutebrowser/img', 'img'), - ('../qutebrowser/javascript', 'javascript'), - ('../qutebrowser/html/doc', 'html/doc'), - ('../qutebrowser/git-commit-id', '.'), - ('../qutebrowser/config/configdata.yml', 'config'), + ('../qutebrowser/html', 'qutebrowser/html'), + ('../qutebrowser/img', 'qutebrowser/img'), + ('../qutebrowser/javascript', 'qutebrowser/javascript'), + ('../qutebrowser/html/doc', 'qutebrowser/html/doc'), + ('../qutebrowser/git-commit-id', 'qutebrowser/'), + ('../qutebrowser/config/configdata.yml', 'qutebrowser/config'), ] if os.path.exists(os.path.join('qutebrowser', '3rdparty', 'pdfjs')): - data_files.append(('../qutebrowser/3rdparty/pdfjs', '3rdparty/pdfjs')) + data_files.append( + ('../qutebrowser/3rdparty/pdfjs', 'qutebrowser/3rdparty/pdfjs')) else: print("Warning: excluding pdfjs as it's not present!") diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py index 4ae0c9cab..85d1612c7 100644 --- a/qutebrowser/utils/utils.py +++ b/qutebrowser/utils/utils.py @@ -208,24 +208,12 @@ def read_file(filename: str, binary: bool = False) -> Any: if not binary and filename in _resource_cache: return _resource_cache[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 + 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: |