From 570f1a849f7679aef471ceb9ddd2292c20a5be76 Mon Sep 17 00:00:00 2001 From: siddhugolu Date: Tue, 24 Oct 2017 12:20:07 +0530 Subject: [PATCH] modified as requested --- qutebrowser/browser/commands.py | 1 - scripts/dev/src2asciidoc.py | 4 ++-- tests/unit/browser/test_tab.py | 1 - tests/unit/browser/webkit/network/test_pac.py | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index c1cff0e37..8f5019499 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -1490,7 +1490,6 @@ class CommandDispatcher: @cmdutils.register(instance='command-dispatcher', scope='window') def view_source(self): """Show the source of the current page in a new tab.""" - tab = self._current_widget() if tab.data.viewing_source: raise cmdexc.CommandError("Already viewing source!") diff --git a/scripts/dev/src2asciidoc.py b/scripts/dev/src2asciidoc.py index bf1fc8fd0..46317142e 100755 --- a/scripts/dev/src2asciidoc.py +++ b/scripts/dev/src2asciidoc.py @@ -499,11 +499,12 @@ def _format_block(filename, what, data): def regenerate_manpage(filename): """Update manpage OPTIONS using an argparse parser.""" - # pylint: disable=protected-access parser = qutebrowser.get_argparser() groups = [] # positionals, optionals and user-defined groups + # pylint: disable=protected-access for group in parser._action_groups: + # pylint: enable=protected-access groupdata = [] groupdata.append('=== {}'.format(group.title)) if group.description is not None: @@ -513,7 +514,6 @@ def regenerate_manpage(filename): if action_data is not None: groupdata.append(action_data) groups.append('\n'.join(groupdata)) - # pylint: enable=protected-access options = '\n'.join(groups) # epilog if parser.epilog is not None: diff --git a/tests/unit/browser/test_tab.py b/tests/unit/browser/test_tab.py index 4b674e583..a2a34d9ce 100644 --- a/tests/unit/browser/test_tab.py +++ b/tests/unit/browser/test_tab.py @@ -92,7 +92,6 @@ class Tab(browsertab.AbstractTab): pass - @pytest.mark.xfail(run=False, reason='Causes segfaults, see #1638') def test_tab(qtbot, view, config_stub, tab_registry, mode_manager): tab_w = Tab(win_id=0, mode_manager=mode_manager) diff --git a/tests/unit/browser/webkit/network/test_pac.py b/tests/unit/browser/webkit/network/test_pac.py index 7519c0fd2..ea8a7acaf 100644 --- a/tests/unit/browser/webkit/network/test_pac.py +++ b/tests/unit/browser/webkit/network/test_pac.py @@ -94,7 +94,6 @@ def _pac_noexcept_test(call): ("known.domain", "'1.2.3.4'"), ("bogus.domain.foobar", "null") ]) - def test_dnsResolve(monkeypatch, domain, expected): def mock_fromName(host): info = QHostInfo()