X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=clientbin%2FgetNodes.py;h=d1c1623f15a1646d8e04153958556672f2108d4d;hb=faa98a764e6a311400ac54933fca910c8bdd1cf2;hp=71d17f02c2e209fc7fc6cd7d99a3b31c085ad80b;hpb=cedf37c8661ec0b05349274962bf2db9cfa6a24d;p=sfa.git diff --git a/clientbin/getNodes.py b/clientbin/getNodes.py index 71d17f02..d1c1623f 100644 --- a/clientbin/getNodes.py +++ b/clientbin/getNodes.py @@ -4,18 +4,21 @@ import sys import os from optparse import OptionParser from pprint import pprint -from types import StringTypes def create_parser(): command = sys.argv[0] argv = sys.argv[1:] usage = "%(command)s [options]" % locals() description = """getNodes will open a rspec file and print all key/values, or filter results based on a given key or set of keys.""" - parser = OptionParser(usage=usage,description=description) - parser.add_option("-i", "--infile", dest="infile", default=None, help = "input rspec file") - parser.add_option("-t", "--tag", dest="tag", default=None, help = "filter rspec for this tag") - parser.add_option("-a", "--attribute", dest="attribute", default=None, help = "comma separated list of attributes to display") - parser.add_option("-r", "--recursive", dest="print_children", default=False, action="store_true", help = "print the tag's child nodes") + parser = OptionParser(usage=usage, description=description) + parser.add_option("-i", "--infile", dest="infile", default=None, + help = "input rspec file") + parser.add_option("-t", "--tag", dest="tag", default=None, + help = "filter rspec for this tag") + parser.add_option("-a", "--attribute", dest="attribute", default=None, + help = "comma separated list of attributes to display") + parser.add_option("-r", "--recursive", dest="print_children", default=False, action="store_true", + help = "print the tag's child nodes") return parser @@ -51,13 +54,18 @@ def print_dict(rdict, options, counter=1): if keys: print tab * (counter) + "(children: %s)" % (",".join(keys)) +# +# this code probably is obsolete +# RSpec is not imported, it does not have a toDict() method anyway +# plus, getNodes.py is not exposed in packaging +# def main(): parser = create_parser(); (options, args) = parser.parse_args() if not options.infile: print "RSpec file not specified" return - + rspec = RSpec() try: rspec.parseFile(options.infile) @@ -77,6 +85,6 @@ def main(): if __name__ == '__main__': try: main() - except Exception, e: + except Exception as e: raise print e