X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fclient%2FgetNodes.py;h=71d17f02c2e209fc7fc6cd7d99a3b31c085ad80b;hb=9277a03fd5b813e866746eae78b633d5f614a375;hp=4d34a43e27e9aee0c0882a5e0b4a78cedaa79fa7;hpb=f13173726f8382eef380f1e754f24dd2b126a77b;p=sfa.git diff --git a/sfa/client/getNodes.py b/sfa/client/getNodes.py index 4d34a43e..71d17f02 100644 --- a/sfa/client/getNodes.py +++ b/sfa/client/getNodes.py @@ -6,8 +6,6 @@ from optparse import OptionParser from pprint import pprint from types import StringTypes -from sfa.util.rspec import Rspec - def create_parser(): command = sys.argv[0] argv = sys.argv[1:] @@ -32,7 +30,7 @@ def print_dict(rdict, options, counter=1): if not isinstance(rdict, dict): raise "%s not a dict" % rdict - for (key, value) in rdict.items(): + for (key, value) in rdict.iteritems(): if isinstance(value, StringTypes): if (attributes and key in attributes) or not attributes: print tab * counter + "%s: %s" % (key, value) @@ -57,10 +55,10 @@ def main(): parser = create_parser(); (options, args) = parser.parse_args() if not options.infile: - print "Rspec file not specified" + print "RSpec file not specified" return - rspec = Rspec() + rspec = RSpec() try: rspec.parseFile(options.infile) except: