Repository : http://git.fedorahosted.org/cgit/cura-tools.git
On branch : master
commit 39a0aa152657c586d3b9ae20099a15bbda3a29de Author: Peter Hatina phatina@redhat.com Date: Thu Dec 6 11:03:02 2012 +0100
add completion of LmiReturnValue properties
cli-tools/lmi-shell.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/cli-tools/lmi-shell.py b/cli-tools/lmi-shell.py index db02813..abefe0d 100755 --- a/cli-tools/lmi-shell.py +++ b/cli-tools/lmi-shell.py @@ -36,7 +36,7 @@ def _lmi_displayhook(o): result_str = "ok" else: result_str = "fail" - sys.stdout.write("%s: %s (%d)" % (o.hostname, result_str, o.rval)) + sys.stdout.write("%s: %s (%s)" % (o.hostname, result_str, str(o.rval))) if o.errorstr: sys.stdout.write(": %s" % o.errorstr) sys.stdout.write("\n") @@ -100,7 +100,7 @@ class _LmiCompleter(rlcompleter.Completer):
def _callable_postfix(self, val, word): if hasattr(val, '__call__') \ - and not isinstance(val, (_LmiNamespace, _LmiClass, _LmiInstance)): + and not isinstance(val, (_LmiNamespace, _LmiClass, _LmiInstance, LmiReturnValue)): word = word + "(" return word
@@ -133,6 +133,10 @@ class _LmiCompleter(rlcompleter.Completer): for p in expr.properties(): if p.lower().startswith(to_complete.lower()): self._last_complete.append(cmd + "." + p) + elif isinstance(expr, LmiReturnValue): + for p in expr.properties(): + if p.lower().startswith(to_complete.lower()): + self._last_complete.append(cmd + "." + p) self._last_complete.extend(cmd + "." + m + "(" for m in methods) self._last_complete.extend(cmd + "." + p for p in properties) return self._last_complete[state]
cura-tools-devel@lists.fedorahosted.org