diff options
author | Doug Hellmann <doug.hellmann@gmail.com> | 2013-11-12 18:14:11 -0500 |
---|---|---|
committer | Doug Hellmann <doug.hellmann@gmail.com> | 2013-11-12 18:14:11 -0500 |
commit | 9b77b62a687359ff9a7f35f50b13ec78b6cb8ae8 (patch) | |
tree | 408448998c7776b92c30a366afbeb511cfc2646b /cliff | |
parent | 7aff3b2611d9e84c0a47ab4410b8259012d23511 (diff) | |
download | cliff-9b77b62a687359ff9a7f35f50b13ec78b6cb8ae8.tar.gz |
Clean up recursive data handling
Diffstat (limited to 'cliff')
-rw-r--r-- | cliff/complete.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cliff/complete.py b/cliff/complete.py index b469e84..340eb7f 100644 --- a/cliff/complete.py +++ b/cliff/complete.py @@ -4,6 +4,7 @@ import logging +import six from cliff import command @@ -29,12 +30,9 @@ class CompleteDictionary: ray = [] keys = sorted(dictionary.keys()) for cmd in keys: - if path == "": - name = cmd - else: - name = path + "_" + cmd + name = path + "_" + cmd if path else cmd value = dictionary[cmd] - if isinstance(value, str): + if isinstance(value, six.string_types): ray.append((name, value)) else: cmdlist = ' '.join(sorted(value.keys())) |