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

Unify _get_count_arg/_get_win_id_arg

Browse Source
This commit is contained in:
Florian Bruhin 2018-11-30 12:59:21 +01:00
parent 566304ab4e
commit 7a90340299
1 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
qutebrowser/commands/command.py
View File

@ -358,39 +358,26 @@ class Command:
tab=tab_id) tab=tab_id)
args.append(obj) args.append(obj)
def _get_count_arg(self, param, args, kwargs): def _add_special_arg(self, *, value, param, args, kwargs, optional=False):
"""Add the count argument to a function call. """Add a special argument value to a function call.
Arguments: Arguments:
param: The count parameter. value: The value to add.
param: The parameter being filled.
args: The positional argument list. Gets modified directly. args: The positional argument list. Gets modified directly.
kwargs: The keyword argument dict. Gets modified directly. kwargs: The keyword argument dict. Gets modified directly.
optional: Whether the value can be optional.
""" """
if not optional:
assert value is not None
if param.kind == inspect.Parameter.POSITIONAL_OR_KEYWORD: if param.kind == inspect.Parameter.POSITIONAL_OR_KEYWORD:
if self._count is not None: if value is not None:
args.append(self._count) args.append(value)
else: else:
args.append(param.default) args.append(param.default)
elif param.kind == inspect.Parameter.KEYWORD_ONLY: elif param.kind == inspect.Parameter.KEYWORD_ONLY:
if self._count is not None: if value is not None:
kwargs[param.name] = self._count kwargs[param.name] = value
else:
raise TypeError("{}: invalid parameter type {} for argument "
"{!r}!".format(self.name, param.kind, param.name))
def _get_win_id_arg(self, win_id, param, args, kwargs):
"""Add the win_id argument to a function call.
Arguments:
win_id: The window ID to add.
param: The count parameter.
args: The positional argument list. Gets modified directly.
kwargs: The keyword argument dict. Gets modified directly.
"""
if param.kind == inspect.Parameter.POSITIONAL_OR_KEYWORD:
args.append(win_id)
elif param.kind == inspect.Parameter.KEYWORD_ONLY:
kwargs[param.name] = win_id
else: else:
raise TypeError("{}: invalid parameter type {} for argument " raise TypeError("{}: invalid parameter type {} for argument "
"{!r}!".format(self.name, param.kind, param.name)) "{!r}!".format(self.name, param.kind, param.name))
@ -452,10 +439,12 @@ class Command:
self._get_self_arg(win_id, param, args) self._get_self_arg(win_id, param, args)
continue continue
elif arg_info.value == usertypes.CommandValue.count: elif arg_info.value == usertypes.CommandValue.count:
self._get_count_arg(param, args, kwargs) self._add_special_arg(value=self._count, param=param,
args=args, kwargs=kwargs, optional=True)
continue continue
elif arg_info.value == usertypes.CommandValue.win_id: elif arg_info.value == usertypes.CommandValue.win_id:
self._get_win_id_arg(win_id, param, args, kwargs) self._add_special_arg(value=win_id, param=param,
args=args, kwargs=kwargs)
continue continue
value = self._get_param_value(param) value = self._get_param_value(param)