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

Report if instance in cmdutils.register is missing

Browse Source
This commit is contained in:
Florian Bruhin 2014-04-28 00:01:21 +02:00
parent a0f27fed61
commit bfecafd686
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
qutebrowser/commands/utils.py
View File

@ -92,7 +92,12 @@ class register: # pylint: disable=invalid-name
else: else:
mainname = name[0] mainname = name[0]
names += name names += name
count, nargs = self._get_nargs_count(func) argspec = inspect.getfullargspec(func)
# pylint: disable=no-member
if 'self' in argspec.args and self.instance is None:
raise ValueError("{} is a class method, but instance was not "
"given!".format(mainname))
count, nargs = self._get_nargs_count(argspec)
if func.__doc__ is not None: if func.__doc__ is not None:
desc = func.__doc__.splitlines()[0].strip().rstrip('.') desc = func.__doc__.splitlines()[0].strip().rstrip('.')
else: else:
@ -106,11 +111,11 @@ class register: # pylint: disable=invalid-name
cmd_dict[name] = cmd cmd_dict[name] = cmd
return func return func
def _get_nargs_count(self, func): def _get_nargs_count(self, spec):
"""Get the number of command-arguments and count-support for a func. """Get the number of command-arguments and count-support for a func.
Args: Args:
func: The function to get the argcount for. spec: A FullArgSpec as returned by inspect.
Return: Return:
A (count, (minargs, maxargs)) tuple, with maxargs=None if there are A (count, (minargs, maxargs)) tuple, with maxargs=None if there are
@ -123,10 +128,8 @@ class register: # pylint: disable=invalid-name
+ (1, None) + (1, None)
* (0, None) * (0, None)
""" """
# pylint: disable=no-member
# pylint: disable=unpacking-non-sequence # pylint: disable=unpacking-non-sequence
# We could use inspect.signature maybe, but that's python >= 3.3 only. # pylint: disable=no-member
spec = inspect.getfullargspec(func)
count = 'count' in spec.args count = 'count' in spec.args
# we assume count always has a default (and it should!) # we assume count always has a default (and it should!)
if self.nargs is not None: if self.nargs is not None: