mirror
/
qutebrowser
mirror of https://github.com/qutebrowser/qutebrowser.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pylint: Enable else-if-used

This commit is contained in:
Florian Bruhin 2021-12-03 11:58:41 +01:00
parent b84d68e8ee
commit 4435ef9287
12 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.pylintrc
View File

@ -12,6 +12,7 @@ load-plugins=qute_pylint.config,
pylint.extensions.comparison_placement,
pylint.extensions.for_any_all,
pylint.extensions.docstyle,
pylint.extensions.check_elif,
pylint.extensions.typing,
persistent=n

1
qutebrowser/browser/commands.py
View File

@ -1034,6 +1034,7 @@ class CommandDispatcher:
if config.val.tabs.wrap:
new_idx %= self._count()
else:
# pylint: disable=else-if-used
# absolute moving
if index == "start":
new_idx = 0

8
qutebrowser/browser/hints.py
View File

@ -596,6 +596,7 @@ class HintManager(QObject):
"'args' is required with target userscript/spawn/run/"
"fill.")
else:
# pylint: disable=else-if-used
if args:
raise cmdutils.CommandError(
"'args' is only allowed with target userscript/spawn.")
@ -870,12 +871,11 @@ class HintManager(QObject):
label.update_text(matched, rest)
# Show label again if it was hidden before
label.show()
else:
elif (not self._context.rapid or
config.val.hints.hide_unmatched_rapid_hints):
# element doesn't match anymore -> hide it, unless in rapid
# mode and hide_unmatched_rapid_hints is false (see #1799)
if (not self._context.rapid or
config.val.hints.hide_unmatched_rapid_hints):
label.hide()
label.hide()
except webelem.Error:
pass
self._handle_auto_follow(keystr=keystr)

1
qutebrowser/browser/shared.py
View File

@ -508,6 +508,7 @@ def _validated_selected_files(
)
continue
else:
# pylint: disable=else-if-used
if not os.path.isfile(selected_file):
message.warning(
f"Expected file but got folder, ignoring '{selected_file}'"

1
qutebrowser/browser/signalfilter.py
View File

@ -88,6 +88,7 @@ class SignalFilter(QObject):
debug.dbg_signal(signal, args), tabidx))
signal.emit(*args)
else:
# pylint: disable=else-if-used
if log_signal:
log.signals.debug("ignoring: {} (tab {})".format(
debug.dbg_signal(signal, args), tabidx))

12
qutebrowser/commands/command.py
View File

@ -272,11 +272,10 @@ class Command:
if is_bool:
kwargs['action'] = 'store_true'
elif arg_info.metavar is not None:
kwargs['metavar'] = arg_info.metavar
else:
if arg_info.metavar is not None:
kwargs['metavar'] = arg_info.metavar
else:
kwargs['metavar'] = argparser.arg_name(param.name)
kwargs['metavar'] = argparser.arg_name(param.name)
if param.kind == inspect.Parameter.VAR_POSITIONAL:
kwargs['nargs'] = '*' if self._star_args_optional else '+'
@ -320,9 +319,8 @@ class Command:
self.opt_args[param.name] = long_flag, short_flag
if not is_bool:
self.flags_with_args += [short_flag, long_flag]
else:
if not arg_info.hide:
self.pos_args.append((param.name, name))
elif not arg_info.hide:
self.pos_args.append((param.name, name))
return args
def _get_type(self, param):

15
qutebrowser/components/braveadblock.py
View File

@ -266,14 +266,13 @@ class BraveAdBlocker:
except DeserializationError:
message.error("Reading adblock filter data failed (corrupted data?). "
"Please run :adblock-update.")
else:
if (
config.val.content.blocking.adblock.lists
and not self._has_basedir
and config.val.content.blocking.enabled
and self.enabled
):
message.info("Run :adblock-update to get adblock lists.")
elif (
config.val.content.blocking.adblock.lists
and not self._has_basedir
and config.val.content.blocking.enabled
and self.enabled
):
message.info("Run :adblock-update to get adblock lists.")
def adblock_update(self) -> blockutils.BlocklistDownloads:
"""Update the adblock block lists."""

5
qutebrowser/config/qtargs.py
View File

@ -260,9 +260,8 @@ def _qtwebengine_args(
# Only actually available in Qt 5.12.5, but let's save another
# check, as passing the option won't hurt.
yield '--enable-in-process-stack-traces'
else:
if 'stack' not in namespace.debug_flags:
yield '--disable-in-process-stack-traces'
elif 'stack' not in namespace.debug_flags:
yield '--disable-in-process-stack-traces'
lang_override = _get_lang_override(
webengine_version=versions.webengine,

7
qutebrowser/mainwindow/tabbedbrowser.py
View File

@ -698,10 +698,9 @@ class TabbedBrowser(QWidget):
"""
if tab.data.keep_icon:
tab.data.keep_icon = False
else:
if (config.cache['tabs.tabs_are_windows'] and
tab.data.should_show_icon()):
self.widget.window().setWindowIcon(self.default_window_icon)
elif (config.cache['tabs.tabs_are_windows'] and
tab.data.should_show_icon()):
self.widget.window().setWindowIcon(self.default_window_icon)
@pyqtSlot()
def _on_load_status_changed(self, tab):

9
qutebrowser/misc/sessions.py
View File

@ -206,12 +206,11 @@ class SessionManager(QObject):
if item.title():
data['title'] = item.title()
else:
elif tab.history.current_idx() == idx:
# https://github.com/qutebrowser/qutebrowser/issues/879
if tab.history.current_idx() == idx:
data['title'] = tab.title()
else:
data['title'] = data['url']
data['title'] = tab.title()
else:
data['title'] = data['url']
if item.originalUrl() != item.url():
encoded = item.originalUrl().toEncoded()

1
qutebrowser/utils/urlutils.py
View File

@ -95,6 +95,7 @@ def _parse_search_term(s: str) -> Tuple[Optional[str], Optional[str]]:
engine = None
term = s
else:
# pylint: disable=else-if-used
if config.val.url.open_base_url and s in config.val.url.searchengines:
engine = s
term = None

7
qutebrowser/utils/utils.py
View File

@ -391,11 +391,10 @@ def get_repr(obj: Any, constructor: bool = False, **attrs: Any) -> str:
parts.append('{}={!r}'.format(name, val))
if constructor:
return '{}({})'.format(cls, ', '.join(parts))
elif parts:
return '<{} {}>'.format(cls, ' '.join(parts))
else:
if parts:
return '<{} {}>'.format(cls, ' '.join(parts))
else:
return '<{}>'.format(cls)
return '<{}>'.format(cls)
def qualname(obj: Any) -> str: