summaryrefslogtreecommitdiffstats
path: root/tests/migration/guestperf/shell.py
diff options
context:
space:
mode:
authorEduardo Habkost2018-06-08 14:29:43 +0200
committerEduardo Habkost2018-06-08 19:39:24 +0200
commitf03868bd5653265e97b253102d77d83ea85efdea (patch)
treef524a2198bb8492e8502326a112d465892d255b0 /tests/migration/guestperf/shell.py
parentMerge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20180608'... (diff)
downloadqemu-f03868bd5653265e97b253102d77d83ea85efdea.tar.gz
qemu-f03868bd5653265e97b253102d77d83ea85efdea.tar.xz
qemu-f03868bd5653265e97b253102d77d83ea85efdea.zip
python: futurize -f libfuturize.fixes.fix_print_with_import
Change all Python code to use print as a function. This is necessary for Python 3 compatibility. Done using: $ py=$( (g grep -l -E '^#!.*python';find -name '*.py' -printf '%P\n';) | \ sort -u | grep -v README.sh4) $ futurize -w -f libfuturize.fixes.fix_print_with_import $py Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Acked-by: Fam Zheng <famz@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Message-Id: <20180608122952.2009-2-ehabkost@redhat.com> [ehabkost: fixup tests/docker/docker.py] Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'tests/migration/guestperf/shell.py')
-rw-r--r--tests/migration/guestperf/shell.py19
1 files changed, 10 insertions, 9 deletions
diff --git a/tests/migration/guestperf/shell.py b/tests/migration/guestperf/shell.py
index b272978f47..a6b8cec1e0 100644
--- a/tests/migration/guestperf/shell.py
+++ b/tests/migration/guestperf/shell.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
#
# Migration test command line shell integration
#
@@ -160,13 +161,13 @@ class Shell(BaseShell):
try:
report = engine.run(hardware, scenario)
if args.output is None:
- print report.to_json()
+ print(report.to_json())
else:
with open(args.output, "w") as fh:
- print >>fh, report.to_json()
+ print(report.to_json(), file=fh)
return 0
except Exception as e:
- print >>sys.stderr, "Error: %s" % str(e)
+ print("Error: %s" % str(e), file=sys.stderr)
if args.debug:
raise
return 1
@@ -199,11 +200,11 @@ class BatchShell(BaseShell):
name = os.path.join(comparison._name, scenario._name)
if not fnmatch.fnmatch(name, args.filter):
if args.verbose:
- print "Skipping %s" % name
+ print("Skipping %s" % name)
continue
if args.verbose:
- print "Running %s" % name
+ print("Running %s" % name)
dirname = os.path.join(args.output, comparison._name)
filename = os.path.join(dirname, scenario._name + ".json")
@@ -211,9 +212,9 @@ class BatchShell(BaseShell):
os.makedirs(dirname)
report = engine.run(hardware, scenario)
with open(filename, "w") as fh:
- print >>fh, report.to_json()
+ print(report.to_json(), file=fh)
except Exception as e:
- print >>sys.stderr, "Error: %s" % str(e)
+ print("Error: %s" % str(e), file=sys.stderr)
if args.debug:
raise
@@ -246,14 +247,14 @@ class PlotShell(object):
if len(args.reports) == 0:
- print >>sys.stderr, "At least one report required"
+ print("At least one report required", file=sys.stderr)
return 1
if not (args.qemu_cpu or
args.vcpu_cpu or
args.total_guest_cpu or
args.split_guest_cpu):
- print >>sys.stderr, "At least one chart type is required"
+ print("At least one chart type is required", file=sys.stderr)
return 1
reports = []