X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=clientbin%2FsfiAddLinks.py;h=24284ef70763b292476eeef9bb56c8ad92bc361d;hp=b16cae6a3eb4c034439bf973e999b4ac922cec09;hb=HEAD;hpb=5a6cbf4fa6837c81354b616d4cfa0352ec5367be diff --git a/clientbin/sfiAddLinks.py b/clientbin/sfiAddLinks.py index b16cae6a..24284ef7 100755 --- a/clientbin/sfiAddLinks.py +++ b/clientbin/sfiAddLinks.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/env python3 import sys @@ -16,10 +16,10 @@ command.add_linkfile_option() command.prep() if not command.opts.linkfile: - print "Missing link list -- exiting" + print("Missing link list -- exiting") command.parser.print_help() sys.exit(1) - + if command.opts.infile: infile = open(command.opts.infile) else: @@ -30,18 +30,19 @@ else: outfile = sys.stdout ad_rspec = RSpec(infile) links = open(command.opts.linkfile).read().split('\n') -link_tuples = map(lambda x: tuple(x.split()), links) +link_tuples = [tuple(x.split()) for x in links] 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_link_requests(link_tuples) except: logger.log_exc("sfiAddLinks FAILED with links %s" % links) sys.exit(1) -print >>outfile, request_rspec.toxml() +print(request_rspec.toxml(), file=outfile) sys.exit(0)