From 9bb2ddc1fbe926dc4eaff3255dd0e2360eaccc91 Mon Sep 17 00:00:00 2001 From: Stefano Belforte Date: Thu, 26 Oct 2017 15:41:38 +0200 Subject: [PATCH] use print_function (#4722) --- doc/generate_modules.py | 9 +++++---- scripts/generate_completion.py | 5 +++-- src/python/CRABAPI/Abstractions.py | 3 ++- src/python/CRABAPI/test_Task.py | 7 ++++--- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/doc/generate_modules.py b/doc/generate_modules.py index e38c943e9..1e8c261cc 100644 --- a/doc/generate_modules.py +++ b/doc/generate_modules.py @@ -7,6 +7,7 @@ creates ReST files appropriately to create code documentation with Sphinx. It also creates a modules index (named modules.). """ +from __future__ import print_function # Copyright 2008 Société des arts technologiques (SAT), http://www.sat.qc.ca/ # Copyright 2010 Thomas Waldmann @@ -56,9 +57,9 @@ def write_file(name, text, opts): return fname = os.path.join(opts.destdir, "%s.%s" % (name, opts.suffix)) if not opts.force and os.path.isfile(fname): - print 'File %s already exists, skipping.' % fname + print ('File %s already exists, skipping.' % fname) else: - print 'Creating file %s.' % fname + print ('Creating file %s.' % fname) f = open(fname, 'w') f.write(text) f.close() @@ -252,9 +253,9 @@ def main(): excludes = normalize_excludes(rootpath, excludes) recurse_tree(rootpath, excludes, opts) else: - print '%s is not a valid output destination directory.' % opts.destdir + print ('%s is not a valid output destination directory.' % opts.destdir) else: - print '%s is not a valid directory.' % rootpath + print ('%s is not a valid directory.' % rootpath) if __name__ == '__main__': diff --git a/scripts/generate_completion.py b/scripts/generate_completion.py index dbf21be2c..34cf7f3b8 100644 --- a/scripts/generate_completion.py +++ b/scripts/generate_completion.py @@ -1,3 +1,4 @@ +from __future__ import print_function import imp import optparse @@ -113,7 +114,7 @@ def __init__(self): cmdflags=' '.join(flags), cmdoptions=' '.join(opts)) -print template.format( +print(template.format( topcommands=' '.join(longnames), topoptions=' '.join(options), - commands=''.join(commands.values())) + commands=''.join(commands.values()))) diff --git a/src/python/CRABAPI/Abstractions.py b/src/python/CRABAPI/Abstractions.py index 737c60252..3acad25eb 100644 --- a/src/python/CRABAPI/Abstractions.py +++ b/src/python/CRABAPI/Abstractions.py @@ -1,4 +1,5 @@ """ Task - top-level Task class """ +from __future__ import print_function import CRABAPI.TopLevel import CRABClient.Commands.submit from WMCore.Configuration import Configuration @@ -19,7 +20,7 @@ def submit(self): args = ['-c', self.config, '--proxy', '1'] submitCommand = self.submitClass(self.clientLog, args) retval = submitCommand() - print "retval was %s" % retval + print("retval was %s" % retval) return retval['uniquerequestname'] def kill(self): diff --git a/src/python/CRABAPI/test_Task.py b/src/python/CRABAPI/test_Task.py index 863dc9877..32bc573dd 100644 --- a/src/python/CRABAPI/test_Task.py +++ b/src/python/CRABAPI/test_Task.py @@ -1,3 +1,4 @@ +from __future__ import print_function import os import os.path import shutil @@ -58,12 +59,12 @@ def get(self, url, req): return {'result':["unittest"]},200,"" if req == {'subresource': 'backendurls'}: return {'result':["unittest.host"]},200,"" - print "%s -> %s" % (url, req) + print("%s -> %s" % (url, req)) def put(self, url, data): if url == '/crabserver/prod/workflow': res = {'result':[{"RequestName" : "UnittestRequest"}]} return res, 200, "" - print "%s -> %s" % (url, data) + print("%s -> %s" % (url, data)) @staticmethod def getCACertPath(): return "/tmp" @@ -92,7 +93,7 @@ def upload(self, name): myTask.config.section_("Site") myTask.config.Site.storageSite = 'T2_US_Nowhere' val = myTask.submit() - print val + print(val) self.assertEqual(val, 'UnittestRequest')