laforge
/
cyberflex-shell
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make it possible to use *args in commands 

git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@38 f711b948-2313-0410-aaa9-d29f33439f0b
This commit is contained in:
henryk 2005-10-09 01:38:06 +00:00
parent 31fa1046f1
commit 0f4f8db895
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
shell.py
View File

@ -138,10 +138,10 @@ class Shell:
(argnames, varargs, varkw, defaults) = \
inspect.getargspec(function)
## maximum number of arguments the function accepts
args_possible = len(argnames) - len(args)
## minimum number of argument the function accepts
args_needed = args_possible - (defaults and len(defaults) or 0)
args_needed = len(argnames) - len(args) - (defaults and len(defaults) or 0)
## maximum number of arguments the function accepts
args_possible = varargs is None and (len(argnames) - len(args)) or None
args_so_far = 0
@ -158,11 +158,14 @@ class Shell:
if args_so_far < args_needed:
print "The %s command takes at least %i arguments. You gave %i." % (command, args_needed, args_so_far)
return
if args_so_far > args_possible:
if args_possible is not None and args_so_far > args_possible:
print "The %s command takes at most %i arguments. You gave %i." % (command, args_possible, args_so_far)
return
return function(*args)
try:
return function(*args)
except NotImplementedError:
print "Unknown command '%s'. Try 'help' to list known commands." % command
def complete(self, line, state):
"""Try to complete a command line. Known command names first,