rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle cx_freeze in read_file.

Browse Source
This commit is contained in:
Florian Bruhin 2014-05-13 10:39:37 +02:00
parent bf639602f5
commit 1c4bb0214d
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qutebrowser/utils/misc.py
View File

@ -25,7 +25,6 @@ import os.path
import urllib.request import urllib.request
from urllib.parse import urljoin, urlencode from urllib.parse import urljoin, urlencode
from functools import reduce from functools import reduce
from pkg_resources import resource_string
from PyQt5.QtCore import QCoreApplication, QStandardPaths from PyQt5.QtCore import QCoreApplication, QStandardPaths
@ -41,7 +40,14 @@ def read_file(filename):
Return: Return:
The file contents as string. 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): def dotted_getattr(obj, path):