From fd64a2e68c2f1333371209d6ee830ff8d0a025c7 Mon Sep 17 00:00:00 2001 From: Allen Lin37 Date: Fri, 3 Mar 2017 13:10:29 -0500 Subject: [PATCH] Fix nodelist and nodeattrib to read attributes in groups --- confluent_client/bin/nodeattrib | 10 ++++++++++ confluent_client/bin/nodelist | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/confluent_client/bin/nodeattrib b/confluent_client/bin/nodeattrib index e0120be4..a05915c6 100644 --- a/confluent_client/bin/nodeattrib +++ b/confluent_client/bin/nodeattrib @@ -125,6 +125,16 @@ if len(args) > 0: attrout = '{0}: {1}: *ERROR* BROKEN EXPRESSION: ' \ '{2}'.format(node, attr, currattr['broken']) + elif isinstance(currattr, list) or isinstance(currattr, tuple): + attrout = '{0}: {1}: {2}'.format(node, attr, ', '.join(map(str, currattr))) + elif isinstance(currattr, dict): + dictout = [] + for k,v in currattr.items: + dictout.append("{0}={1}".format(k,v)) + attrout = '{0}: {1}: {2}'.format(node, attr, ', '.join(map(str, dictout))) + else: + print ("CODE ERROR" + repr(attr)) + if options.blame or 'broken' in currattr: blamedata = [] if 'inheritedfrom' in currattr: diff --git a/confluent_client/bin/nodelist b/confluent_client/bin/nodelist index 6cff5dcd..92ea8320 100755 --- a/confluent_client/bin/nodelist +++ b/confluent_client/bin/nodelist @@ -80,6 +80,16 @@ if len(args) > 1: attrout = '{0}: {1}: *ERROR* BROKEN EXPRESSION: ' \ '{2}'.format(node, attr, currattr['broken']) + elif isinstance(currattr, list) or isinstance(currattr, tuple): + attrout = '{0}: {1}: {2}'.format(node, attr, ', '.join(map(str, currattr))) + elif isinstance(currattr, dict): + dictout = [] + for k, v in currattr.items: + dictout.append("{0}={1}".format(k, v)) + attrout = '{0}: {1}: {2}'.format(node, attr, ', '.join(map(str, dictout))) + else: + print ("CODE ERROR" + repr(attr)) + if options.blame or 'broken' in currattr: blamedata = [] if 'inheritedfrom' in currattr: