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

Fix lint

Browse Source
This commit is contained in:
Florian Bruhin 2016-09-05 16:21:30 +02:00
parent ba718a2b9d
commit 61270b8f92
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qutebrowser/browser/webengine/webview.py
View File

@ -67,8 +67,8 @@ class WebEngineView(QWebEngineView):
# WORKAROUND for https://bugreports.qt.io/browse/QTBUG-54419 # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-54419
vercheck = qtutils.version_check vercheck = qtutils.version_check
qtbug_54419_fixed = ((vercheck('5.6.2') and not vercheck('5.7.0')) or qtbug_54419_fixed = ((vercheck('5.6.2') and not vercheck('5.7.0')) or
qtutils.version_check('5.7.1') or qtutils.version_check('5.7.1') or
os.environ.get('QUTE_QTBUG54419_PATCHED', '')) os.environ.get('QUTE_QTBUG54419_PATCHED', ''))
if not qtbug_54419_fixed: if not qtbug_54419_fixed:
message.error(self._win_id, "Qt 5.6.2/5.7.1 or newer is required " message.error(self._win_id, "Qt 5.6.2/5.7.1 or newer is required "
"to open new tabs via JS!") "to open new tabs via JS!")

11
tests/end2end/conftest.py
View File

@ -100,6 +100,7 @@ def _get_version_tag(tag):
else: else:
raise ValueError("Invalid package {!r}".format(package)) raise ValueError("Invalid package {!r}".format(package))
def _get_backend_tag(tag): def _get_backend_tag(tag):
"""Handle a @qtwebengine_*/@qtwebkit_skip tag.""" """Handle a @qtwebengine_*/@qtwebkit_skip tag."""
pytest_marks = { pytest_marks = {
@ -140,15 +141,13 @@ def pytest_collection_modifyitems(config, items):
# markers, so we should apply the most general markers last. # markers, so we should apply the most general markers last.
markers = [ markers = [
('qtwebengine_createWindow', 'Skipped because of QTBUG-54419', ('qtwebengine_createWindow', 'Skipped because of QTBUG-54419',
pytest.mark.skipif, pytest.mark.skipif, not qtbug_54419_fixed and config.webengine),
not qtbug_54419_fixed and
config.webengine),
('qtwebengine_todo', 'QtWebEngine TODO', pytest.mark.xfail, ('qtwebengine_todo', 'QtWebEngine TODO', pytest.mark.xfail,
config.webengine), config.webengine),
('qtwebengine_skip', 'Skipped with QtWebEngine', pytest.mark.skipif, ('qtwebengine_skip', 'Skipped with QtWebEngine', pytest.mark.skipif,
config.webengine), config.webengine),
('qtwebkit_skip', 'Skipped with QtWebKit', pytest.mark.skipif, ('qtwebkit_skip', 'Skipped with QtWebKit', pytest.mark.skipif,
not config.webengine), not config.webengine),
] ]
for item in items: for item in items: