From 1c4bb0214de3882ffdc4b4d76601c2077c3a4b81 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 13 May 2014 10:39:37 +0200 Subject: [PATCH] Handle cx_freeze in read_file. --- qutebrowser/utils/misc.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/qutebrowser/utils/misc.py b/qutebrowser/utils/misc.py index e50f9f6b0..b9416f491 100644 --- a/qutebrowser/utils/misc.py +++ b/qutebrowser/utils/misc.py @@ -25,7 +25,6 @@ import os.path import urllib.request from urllib.parse import urljoin, urlencode from functools import reduce -from pkg_resources import resource_string from PyQt5.QtCore import QCoreApplication, QStandardPaths @@ -41,7 +40,14 @@ def read_file(filename): Return: The file contents as string. """ - return resource_string(qutebrowser.__name__, filename).decode('UTF-8') + if hasattr(sys, 'frozen'): + # cx_Freeze doesn't support pkg_resources :( + fn = os.path.join(os.path.dirname(sys.executable), filename) + with open(fn, 'r', encoding='UTF-8') as f: + return f.read() + else: + from pkg_resources import resource_string + return resource_string(qutebrowser.__name__, filename).decode('UTF-8') def dotted_getattr(obj, path):