Browse Source

properly call methods not wrapped by protectDjangoErrPage (ie, dbus)

Natenom/support-murmur-13-1446181288462
Michael Ziegler 15 years ago
parent
commit
bd7138b34c
  1. 7
      pyweb/mucli.py

7
pyweb/mucli.py

@ -150,8 +150,10 @@ else:
print >> sys.stderr, "Method name: %s" % progargs[0] print >> sys.stderr, "Method name: %s" % progargs[0]
method = getattr( ctl, progargs[0] ) method = getattr( ctl, progargs[0] )
bound = True
if hasattr( method, "innerfunc" ): if hasattr( method, "innerfunc" ):
method = method.innerfunc method = method.innerfunc
bound = False
args = inspect.getargspec( method )[0] args = inspect.getargspec( method )[0]
@ -180,7 +182,10 @@ else:
if options.verbose: if options.verbose:
print >> sys.stderr, "Call arguments: %s" % repr(cleanargs) print >> sys.stderr, "Call arguments: %s" % repr(cleanargs)
print method( ctl, *cleanargs )
if bound:
print method( *cleanargs )
else:
print method( ctl, *cleanargs )
elif len(args) == 1: elif len(args) == 1:
print >> sys.stderr, "Method '%s' does not take any arguments." % progargs[0] print >> sys.stderr, "Method '%s' does not take any arguments." % progargs[0]

Loading…
Cancel
Save