X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=clientbin%2FsfiAddSliver.py;h=72b649b553e3b3ca8dab023e1edabc4a00c10164;hp=84ffa8b0301e89b26f5cb848c42c08cabcecc16b;hb=HEAD;hpb=1db1a879ffde8991aa95dd80142d555551655e88 diff --git a/clientbin/sfiAddSliver.py b/clientbin/sfiAddSliver.py index 84ffa8b0..72b649b5 100755 --- a/clientbin/sfiAddSliver.py +++ b/clientbin/sfiAddSliver.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/env python3 import sys @@ -16,30 +16,31 @@ command.add_nodefile_option() command.prep() if not command.opts.nodefile: - print "Missing node list -- exiting" + print("Missing node list -- exiting") command.parser.print_help() sys.exit(1) - + if command.opts.infile: - infile=file(command.opts.infile) + infile = open(command.opts.infile) else: - infile=sys.stdin + infile = sys.stdin if command.opts.outfile: - outfile=file(command.opts.outfile,"w") + outfile = open(command.opts.outfile, "w") else: - outfile=sys.stdout + outfile = sys.stdout ad_rspec = RSpec(infile) -nodes = file(command.opts.nodefile).read().split() +nodes = open(command.opts.nodefile).read().split() version_manager = VersionManager() try: type = ad_rspec.version.type version_num = ad_rspec.version.version - request_version = version_manager._get_version(type, version_num, 'request') + request_version = version_manager._get_version( + type, version_num, 'request') request_rspec = RSpec(version=request_version) request_rspec.version.merge(ad_rspec) request_rspec.version.add_slivers(nodes) except: logger.log_exc("sfiAddSliver failed with nodes %s" % nodes) sys.exit(1) -print >>outfile, request_rspec.toxml() +print(request_rspec.toxml(), file=outfile) sys.exit(0)