mirror of
https://github.com/Motorhead1991/qemu.git
synced 2026-01-06 22:47:41 -07:00
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>
This commit is contained in:
parent
0d2fa03dae
commit
f03868bd56
32 changed files with 281 additions and 256 deletions
|
|
@ -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 = []
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue