117: Improved readability of cmd.print_call()

This commit is contained in:
Jason Gerard DeRose 2008-08-12 18:02:49 +00:00
parent 7bbeb2db69
commit 4acb7567c4

View File

@ -184,7 +184,7 @@ class cmd(plugable.Plugin):
yield (key, value) yield (key, value)
def normalize(self, **kw): def normalize(self, **kw):
self.print_call('normalize', kw) self.print_call('normalize', kw, 1)
return dict(self.normalize_iter(kw)) return dict(self.normalize_iter(kw))
def default_iter(self, kw): def default_iter(self, kw):
@ -195,27 +195,29 @@ class cmd(plugable.Plugin):
yield(option.name, value) yield(option.name, value)
def default(self, **kw): def default(self, **kw):
self.print_call('default', kw) self.print_call('default', kw, 1)
return dict(self.default_iter(kw)) return dict(self.default_iter(kw))
def validate(self, **kw): def validate(self, **kw):
self.print_call('validate', kw) self.print_call('validate', kw, 1)
for (key, value) in kw.items(): for (key, value) in kw.items():
if key in self.options: if key in self.options:
self.options[key].validate(value) self.options[key].validate(value)
def execute(self, **kw): def execute(self, **kw):
self.print_call('execute', kw) self.print_call('execute', kw, 1)
pass pass
def print_call(self, method, kw): def print_call(self, method, kw, tab=0):
print '%s.%s(%s)' % ( print '%s%s.%s(%s)\n' % (
' ' * (tab *2),
self.name, self.name,
method, method,
', '.join('%s=%r' % (k, v) for (k, v) in kw.items()), ', '.join('%s=%r' % (k, v) for (k, v) in kw.items()),
) )
def __call__(self, **kw): def __call__(self, **kw):
print ''
self.print_call('__call__', kw) self.print_call('__call__', kw)
kw = self.normalize(**kw) kw = self.normalize(**kw)
kw.update(self.default(**kw)) kw.update(self.default(**kw))