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

Make sure we always yield full names

Browse Source
This commit is contained in:
Florian Bruhin 2018-12-10 11:41:37 +01:00
parent 6bc771151f
commit bb115afc1a
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/qutebrowser.spec
View File

@ -32,7 +32,7 @@ def get_data_files():
def get_hidden_imports(): def get_hidden_imports():
imports = ['PyQt5.QtOpenGL', 'PyQt5._QOpenGLFunctions_2_0'] imports = ['PyQt5.QtOpenGL', 'PyQt5._QOpenGLFunctions_2_0']
for info in loader.walk_components(): for info in loader.walk_components():
imports.append('qutebrowser.components.' + info.name) imports.append(info.name)
return imports return imports

12
qutebrowser/extensions/loader.py
View File

@ -51,13 +51,19 @@ def walk_components() -> typing.Iterator[ComponentInfo]:
yield from _walk_normal() yield from _walk_normal()
def _walk_error(name: str):
raise ImportError("Failed to import {}".format(name))
def _walk_normal() -> typing.Iterator[ComponentInfo]: def _walk_normal() -> typing.Iterator[ComponentInfo]:
"""Walk extensions when not using PyInstaller.""" """Walk extensions when not using PyInstaller."""
for _finder, name, ispkg in pkgutil.walk_packages(components.__path__): for _finder, name, ispkg in pkgutil.walk_packages(
path=components.__path__,
prefix=components.__name__ + '.',
onerror=_walk_error):
if ispkg: if ispkg:
continue continue
fullname = components.__name__ + '.' + name yield ComponentInfo(name=name)
yield ComponentInfo(name=fullname)
def _walk_pyinstaller() -> typing.Iterator[ComponentInfo]: def _walk_pyinstaller() -> typing.Iterator[ComponentInfo]: