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

Fix new flake8 lint.

Browse Source 
For some reason these issues weren't shown with pytest-pep8/flakes.
This commit is contained in:
Florian Bruhin 2016-01-21 18:07:56 +01:00
parent 1952e070fd
commit 526441bcae
22 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qutebrowser/misc/split.py
View File

@ -55,7 +55,7 @@ class ShellLexer:
self.token = ''
self.state = ' '
def __iter__(self): # pragma: no mccabe
def __iter__(self): # noqa
"""Read a raw token from the input stream."""
# pylint: disable=too-many-branches,too-many-statements
self.reset()

5
tests/conftest.py
View File

@ -76,8 +76,7 @@ def _apply_platform_markers(item):
continue
if 'reason' in marker.kwargs:
reason = '{}: {}'.format(default_reason,
marker.kwargs['reason'])
reason = '{}: {}'.format(default_reason, marker.kwargs['reason'])
del marker.kwargs['reason']
else:
reason = default_reason + '.'
@ -388,8 +387,10 @@ def py_proc():
"""Get a python executable and args list which executes the given code."""
if getattr(sys, 'frozen', False):
pytest.skip("Can't be run when frozen")
def func(code):
return (sys.executable, ['-c', textwrap.dedent(code.strip('\n'))])
return func

1
tests/helpers/utils.py
View File

@ -66,7 +66,6 @@ def partial_compare(val1, val2, *, indent=0):
print_i("|---- to ----", indent)
print_i(pprint.pformat(val2), indent + 1)
if val2 is Ellipsis:
print_i("Ignoring ellipsis comparison", indent, error=True)
return True

1
tests/integration/features/test_prompts.py
View File

@ -44,6 +44,7 @@ def wait_for_prompt(quteproc):
quteproc.wait_for(message='Entering mode KeyMode.* (reason: question '
'asked)')
@bdd.then("no prompt should be shown")
def no_prompt_shown(quteproc):
quteproc.ensure_not_logged(message='Entering mode KeyMode.* (reason: '

10
tests/integration/test_quteprocess.py
View File

@ -88,7 +88,7 @@ def test_quteprocess_quitting(qtbot, quteproc_process):
'category': 'init',
'module': 'earlyinit',
'function': 'init_log',
'line': 280,
'line': 280,
'message': 'Log initialized.',
'expected': False,
}
@ -122,10 +122,10 @@ def test_quteprocess_quitting(qtbot, quteproc_process):
}
),
(
'00:00:00 WARNING qt qxcbxsettings:"QXcbXSettings::'
'QXcbXSettings(QXcbScreen*)":233 '
'QXcbXSettings::QXcbXSettings(QXcbScreen*) Failed to get selection '
'owner for XSETTINGS_S atom ',
'00:00:00 WARNING qt qxcbxsettings:"QXcbXSettings::'
'QXcbXSettings(QXcbScreen*)":233 '
'QXcbXSettings::QXcbXSettings(QXcbScreen*) Failed to get selection '
'owner for XSETTINGS_S atom ',
{
'module': 'qxcbxsettings',
'function': 'QXcbXSettings::QXcbXSettings(QXcbScreen*)',

8
tests/integration/test_webserver.py
View File

@ -52,11 +52,11 @@ def test_httpbin(httpbin, qtbot, path, content, expected):
@pytest.mark.parametrize('line, verb, path, equal', [
({'verb': 'GET', 'path': '/', 'status': 200}, 'GET', '/', True),
({'verb': 'GET', 'path': '/foo/', 'status': 200}, 'GET', '/foo', True),
({'verb': 'GET', 'path': '/', 'status': 200}, 'GET', '/', True),
({'verb': 'GET', 'path': '/foo/', 'status': 200}, 'GET', '/foo', True),
({'verb': 'GET', 'path': '/', 'status': 200}, 'GET', '/foo', False),
({'verb': 'POST', 'path': '/', 'status': 200}, 'GET', '/', False),
({'verb': 'GET', 'path': '/', 'status': 200}, 'GET', '/foo', False),
({'verb': 'POST', 'path': '/', 'status': 200}, 'GET', '/', False),
])
def test_expected_request(httpbin, line, verb, path, equal):
expected = httpbin.ExpectedRequest(verb, path)

1
tests/unit/browser/http/test_http.py
View File

@ -29,7 +29,6 @@ from PyQt5.QtCore import QUrl
from qutebrowser.browser import http
class TestNoContentDisposition:
"""Test parse_content_disposition with no Content-Disposition header."""

3
tests/unit/browser/test_cache.py
View File

@ -100,7 +100,7 @@ def test_cache_size_leq_max_cache_size(config_stub, tmpdir):
preload_cache(disk_cache, 'http://bar.net')
assert disk_cache.expire() < limit
# Add a threshold to the limit due to unforseeable Qt internals
assert disk_cache.cacheSize() < limit+100
assert disk_cache.cacheSize() < limit + 100
def test_cache_size_deactivated(config_stub, tmpdir):
@ -249,7 +249,6 @@ def test_cache_deactivated_insert_data(config_stub, tmpdir):
assert deactivated_cache.insert(device) is None
def test_cache_remove_data(config_stub, tmpdir):
"""Test if a previously inserted entry can be removed from the cache."""
config_stub.data = {

1
tests/unit/browser/test_mhtml.py
View File

@ -27,6 +27,7 @@ import pytest
from qutebrowser.browser import mhtml
@pytest.fixture(autouse=True)
def patch_uuid(monkeypatch):
monkeypatch.setattr("uuid.uuid4", lambda: "UUID")

1
tests/unit/browser/test_signalfilter.py
View File

@ -82,6 +82,7 @@ def objects():
signal_filter.create(signaller.cur_statusbar_message, tab))
return Objects(signal_filter=signal_filter, signaller=signaller)
@pytest.yield_fixture
def tabbed_browser(win_registry):
tb = FakeTabbedBrowser()

4
tests/unit/browser/test_tabhistory.py
View File

@ -42,8 +42,8 @@ ITEMS = [
# From https://github.com/OtterBrowser/otter-browser/issues/709#issuecomment-74749471
Item(QUrl('http://github.com/OtterBrowser/24/134/2344/otter-browser/'
'issues/709/'),
'Page not found | github',
user_data={'zoom': 149, 'scroll-pos': QPoint(0, 0)}),
'Page not found | github',
user_data={'zoom': 149, 'scroll-pos': QPoint(0, 0)}),
Item(QUrl('https://mail.google.com/mail/u/0/#label/some+label/'
'234lkjsd0932lkjf884jqwerdf4'),
'"some label" - email@gmail.com - Gmail"',

4
tests/unit/browser/test_webelem.py
View File

@ -67,7 +67,7 @@ def get_webelem(geometry=None, frame=None, null=False, style=None,
elem.hasAttribute.side_effect = lambda k: k in attribute_dict
elem.attribute.side_effect = lambda k: attribute_dict.get(k, '')
elem.setAttribute.side_effect = (lambda k, v:
operator.setitem(attribute_dict, k, v))
operator.setitem(attribute_dict, k, v))
elem.removeAttribute.side_effect = attribute_dict.pop
elem.attributeNames.return_value = list(attribute_dict)
@ -112,7 +112,7 @@ class SelectionAndFilterTests:
('<a href="foo" />', [webelem.Group.all, webelem.Group.links,
webelem.Group.prevnext, webelem.Group.url]),
('<a href="javascript://foo" />', [webelem.Group.all,
webelem.Group.url]),
webelem.Group.url]),
('<area />', [webelem.Group.all]),
('<area href="foo" />', [webelem.Group.all, webelem.Group.links,

1
tests/unit/commands/test_cmdutils.py
View File

@ -77,7 +77,6 @@ class TestCheckExclusive:
assert str(excinfo.value) == "Only one of -x/-y/-z can be given!"
class TestRegister:
# pylint: disable=unused-variable

4
tests/unit/config/test_config.py
View File

@ -97,7 +97,7 @@ class TestConfigParser:
def test_invalid_value_interpolated(self, objects):
"""Test setting an invalid interpolated value."""
objects.cp.read_dict({'general': {'ignore-case': 'smart',
'wrap-search': '${ignore-case}'}})
'wrap-search': '${ignore-case}'}})
objects.cfg._from_cp(objects.cp)
with pytest.raises(configexc.ValidationError):
objects.cfg._validate_all()
@ -105,7 +105,7 @@ class TestConfigParser:
def test_interpolation(self, objects):
"""Test setting an interpolated value."""
objects.cp.read_dict({'general': {'ignore-case': 'false',
'wrap-search': '${ignore-case}'}})
'wrap-search': '${ignore-case}'}})
objects.cfg._from_cp(objects.cp)
assert not objects.cfg.get('general', 'ignore-case')
assert not objects.cfg.get('general', 'wrap-search')

3
tests/unit/config/test_configtypes.py
View File

@ -362,7 +362,7 @@ class TestList:
def test_validate_valid(self, klass, val):
klass(none_ok=True).validate(val)
@pytest.mark.parametrize('val', ['', 'foo,,bar',])
@pytest.mark.parametrize('val', ['', 'foo,,bar'])
def test_validate_invalid(self, klass, val):
with pytest.raises(configexc.ValidationError):
klass().validate(val)
@ -1036,7 +1036,6 @@ class TestFont:
font_xfail = pytest.mark.xfail(reason='FIXME: #103')
@pytest.fixture(params=[configtypes.Font, configtypes.QtFont])
def klass(self, request):
return request.param

5
tests/unit/misc/test_checkpyver.py
View File

@ -37,8 +37,9 @@ def test_python2():
"""Run checkpyver with python 2."""
try:
proc = subprocess.Popen(['python2', checkpyver.__file__,
'--no-err-windows'], stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
'--no-err-windows'],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
stdout, stderr = proc.communicate()
except FileNotFoundError:
pytest.skip("python2 not found")

12
tests/unit/misc/test_ipc.py
View File

@ -329,10 +329,10 @@ class TestListen:
file_mode_ok = file_stat.st_mode & 0o777 == 0o700
dir_mode_ok = dir_stat.st_mode & 0o777 == 0o700
print('sockdir: {} / owner {} / mode {:o}'.format(sockdir,
dir_stat.st_uid, dir_stat.st_mode))
print('sockfile: {} / owner {} / mode {:o}'.format(sockfile,
file_stat.st_uid, file_stat.st_mode))
print('sockdir: {} / owner {} / mode {:o}'.format(
sockdir, dir_stat.st_uid, dir_stat.st_mode))
print('sockfile: {} / owner {} / mode {:o}'.format(
sockfile, file_stat.st_uid, file_stat.st_mode))
assert file_owner_ok or dir_owner_ok
assert file_mode_ok or dir_mode_ok
@ -831,8 +831,8 @@ class TestSendOrListen:
'title: Error while connecting to running instance!',
'pre_text: ',
'post_text: Maybe another instance is running but frozen?',
'exception text: Error while listening to IPC server: Error '
'string (error 4)',
('exception text: Error while listening to IPC server: Error '
'string (error 4)'),
]
assert caplog.records[0].msg == '\n'.join(error_msgs)

3
tests/unit/misc/test_sessions.py
View File

@ -38,6 +38,7 @@ from qutebrowser.commands import cmdexc
pytestmark = pytest.mark.qt_log_ignore('QIODevice::read.*: device not open',
extend=True)
@pytest.fixture
def sess_man():
"""Fixture providing a SessionManager with no session dir."""
@ -246,7 +247,7 @@ class TestSaveTab:
items = [
Item(url=QUrl('http://www.example.com/'), title='Test title',
active=True),
active=True),
Item(url=QUrl('http://www.example.com/'), title='Test title',
user_data={'zoom': factor}),
]

5
tests/unit/utils/test_debug.py
View File

@ -239,7 +239,6 @@ class TestGetAllObjects:
def __repr__(self):
return '<{}>'.format(self._name)
def test_get_all_objects(self, stubs, monkeypatch):
# pylint: disable=unused-variable
widgets = [self.Object('Widget 1'), self.Object('Widget 2')]
@ -248,8 +247,8 @@ class TestGetAllObjects:
root = QObject()
o1 = self.Object('Object 1', root)
o2 = self.Object('Object 2', o1)
o3 = self.Object('Object 3', root)
o2 = self.Object('Object 2', o1) # noqa
o3 = self.Object('Object 3', root) # noqa
expected = textwrap.dedent("""
Qt widgets - 2 objects:

3
tests/unit/utils/test_urlutils.py
View File

@ -532,6 +532,7 @@ def test_same_domain(are_same, url1, url2):
assert urlutils.same_domain(QUrl(url1), QUrl(url2)) == are_same
assert urlutils.same_domain(QUrl(url2), QUrl(url1)) == are_same
@pytest.mark.parametrize('url1, url2', [
('http://example.com', ''),
('', 'http://example.com'),
@ -618,7 +619,7 @@ class TestIncDecNumber:
after decrementing."""
with pytest.raises(urlutils.IncDecError):
urlutils.incdec_number(QUrl('http://example.com/page_0.html'),
'decrement')
'decrement')
def test_invalid_url(self):
"""Test if incdec_number rejects an invalid URL."""

1
tests/unit/utils/test_utils.py
View File

@ -530,7 +530,6 @@ def test_parse_single_key(keystr, expected):
assert utils._parse_single_key(keystr) == expected
@pytest.mark.parametrize('keystr, expected', [
('<Control-x>', [utils.KeyInfo(Qt.Key_X, Qt.ControlModifier, '')]),
('x', [utils.KeyInfo(Qt.Key_X, Qt.NoModifier, 'x')]),

2
tests/unit/utils/usertypes/test_enum.py
View File

@ -44,7 +44,7 @@ def test_name(enum):
def test_unknown(enum):
"""Test invalid values which should raise an AttributeError."""
with pytest.raises(AttributeError):
_ = enum.three
_ = enum.three # noqa
def test_start():