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

QtWebEngine: Fix 'unset' with run_js_blocking

Browse Source
This commit is contained in:
Florian Bruhin 2016-07-13 18:17:37 +02:00
parent a7509d5978
commit c9176b7c58
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qutebrowser/browser/webengine/webenginetab.py
View File

@ -344,8 +344,9 @@ class WebEngineTab(browsertab.AbstractTab):
self._widget.page().runJavaScript(code, callback) self._widget.page().runJavaScript(code, callback)
def run_js_blocking(self, code): def run_js_blocking(self, code):
unset = object()
loop = qtutils.EventLoop() loop = qtutils.EventLoop()
js_ret = None js_ret = unset
def js_cb(val): def js_cb(val):
"""Handle return value from JS and stop blocking.""" """Handle return value from JS and stop blocking."""
@ -355,7 +356,7 @@ class WebEngineTab(browsertab.AbstractTab):
self.run_js_async(code, js_cb) self.run_js_async(code, js_cb)
loop.exec_() # blocks until loop.quit() in js_cb loop.exec_() # blocks until loop.quit() in js_cb
assert js_ret is not None assert js_ret is not unset
return js_ret return js_ret

5
tests/unit/browser/test_tab.py
View File

@ -122,8 +122,9 @@ def test_tab(qtbot, view, config_stub, tab_registry):
class TestJs: class TestJs:
def test_blocking(self, tab): @pytest.mark.parametrize('inp, expected', [('1+1', 2), ('undefined', None)])
assert tab.run_js_blocking('1 + 1') == 2 def test_blocking(self, tab, inp, expected):
assert tab.run_js_blocking(inp) == expected
class TestTabData: class TestTabData: