* [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11
@ 2018-06-11 17:42 Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 01/13] python: futurize -f libfuturize.fixes.fix_print_with_import Eduardo Habkost
` (15 more replies)
0 siblings, 16 replies; 19+ messages in thread
From: Eduardo Habkost @ 2018-06-11 17:42 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Eduardo Habkost, Cleber Rosa
The following changes since commit 0d2fa03dae4fbe185a082f361342b1e30aed4582:
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20180608' into staging (2018-06-08 16:26:51 +0100)
are available in the Git repository at:
git://github.com/ehabkost/qemu.git tags/python-next-pull-request
for you to fetch changes up to c7883412440905b41dde7e70f4af782932e80e90:
python: Remove scripts/ordereddict.py (2018-06-08 16:40:54 -0300)
----------------------------------------------------------------
Python queue, 2018-06-11
* Make code compatible with Python 3 using 'futurize --stage1'
* Require Python >= 2.7 and remove Python 2.6 compatibility
modules
----------------------------------------------------------------
Eduardo Habkost (13):
python: futurize -f libfuturize.fixes.fix_print_with_import
python: futurize -f libfuturize.fixes.fix_absolute_import
python: futurize -f libfuturize.fixes.fix_next_call
python: futurize -f lib2to3.fixes.fix_has_key
python: futurize -f lib2to3.fixes.fix_standarderror
python: futurize -f lib2to3.fixes.fix_reduce
python: futurize -f lib2to3.fixes.fix_tuple_params
python: futurize -f lib2to3.fixes.fix_renames
python: futurize -f lib2to3.fixes.fix_except
python: futurize -f lib2to3.fixes.fix_numliterals
configure: Require Python 2.7 or newer
python: Remove scripts/argparse.py
python: Remove scripts/ordereddict.py
configure | 4 +-
Makefile | 1 -
scripts/analyse-9p-simpletrace.py | 89 +-
scripts/analyse-locks-simpletrace.py | 3 +-
scripts/analyze-migration.py | 11 +-
scripts/argparse.py | 2406 ----------------------
scripts/dump-guest-memory.py | 1 +
scripts/ordereddict.py | 128 --
scripts/qapi/common.py | 5 +-
scripts/replay-dump.py | 21 +-
scripts/signrom.py | 1 +
scripts/simpletrace.py | 5 +-
scripts/vmstate-static-checker.py | 89 +-
scripts/device-crash-test | 3 +-
scripts/kvm/kvm_flightrecorder | 21 +-
scripts/kvm/vmxcap | 1 +
scripts/qmp/qemu-ga-client | 10 +-
scripts/qmp/qmp | 24 +-
scripts/qmp/qmp-shell | 40 +-
scripts/qmp/qom-fuse | 11 +-
scripts/qmp/qom-get | 12 +-
scripts/qmp/qom-list | 16 +-
scripts/qmp/qom-set | 10 +-
scripts/qmp/qom-tree | 16 +-
tests/Makefile.include | 1 -
tests/docker/docker.py | 17 +-
tests/docker/travis.py | 15 +-
tests/guest-debug/test-gdbstub.py | 1 +
tests/image-fuzzer/qcow2/__init__.py | 3 +-
tests/image-fuzzer/qcow2/fuzz.py | 1 +
tests/image-fuzzer/qcow2/layout.py | 3 +-
tests/image-fuzzer/runner.py | 42 +-
tests/migration/guestperf/engine.py | 29 +-
tests/migration/guestperf/plot.py | 17 +-
tests/migration/guestperf/shell.py | 19 +-
tests/qemu-iotests/093 | 2 +-
tests/qemu-iotests/096 | 4 +-
tests/qemu-iotests/118 | 24 +-
tests/qemu-iotests/136 | 2 +-
tests/qemu-iotests/149 | 3 +-
tests/qemu-iotests/165 | 3 +-
tests/qemu-iotests/iotests.py | 5 +-
tests/qemu-iotests/nbd-fault-injector.py | 7 +-
tests/qemu-iotests/qcow2.py | 39 +-
tests/qemu-iotests/qed.py | 17 +-
tests/vm/basevm.py | 3 +-
46 files changed, 341 insertions(+), 2844 deletions(-)
delete mode 100644 scripts/argparse.py
delete mode 100644 scripts/ordereddict.py
--
2.18.0.rc1.1.g3f1ff2140
^ permalink raw reply [flat|nested] 19+ messages in thread
* [Qemu-devel] [PULL 01/13] python: futurize -f libfuturize.fixes.fix_print_with_import
2018-06-11 17:42 [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11 Eduardo Habkost
@ 2018-06-11 17:42 ` Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 02/13] python: futurize -f libfuturize.fixes.fix_absolute_import Eduardo Habkost
` (14 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: Eduardo Habkost @ 2018-06-11 17:42 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Eduardo Habkost, Cleber Rosa
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>
---
scripts/analyse-9p-simpletrace.py | 89 ++++++++++++------------
scripts/analyse-locks-simpletrace.py | 1 +
scripts/analyze-migration.py | 11 +--
scripts/dump-guest-memory.py | 1 +
scripts/replay-dump.py | 21 +++---
scripts/signrom.py | 1 +
scripts/simpletrace.py | 3 +-
scripts/vmstate-static-checker.py | 85 +++++++++++-----------
scripts/device-crash-test | 3 +-
scripts/kvm/kvm_flightrecorder | 21 +++---
scripts/kvm/vmxcap | 1 +
scripts/qmp/qemu-ga-client | 1 +
scripts/qmp/qmp | 17 ++---
scripts/qmp/qmp-shell | 35 +++++-----
scripts/qmp/qom-get | 7 +-
scripts/qmp/qom-list | 11 +--
scripts/qmp/qom-set | 5 +-
scripts/qmp/qom-tree | 11 +--
tests/docker/docker.py | 17 ++---
tests/docker/travis.py | 15 ++--
tests/guest-debug/test-gdbstub.py | 1 +
tests/image-fuzzer/runner.py | 38 +++++-----
tests/migration/guestperf/engine.py | 29 ++++----
tests/migration/guestperf/plot.py | 17 ++---
tests/migration/guestperf/shell.py | 19 ++---
tests/qemu-iotests/149 | 3 +-
tests/qemu-iotests/165 | 3 +-
tests/qemu-iotests/iotests.py | 5 +-
tests/qemu-iotests/nbd-fault-injector.py | 7 +-
tests/qemu-iotests/qcow2.py | 39 ++++++-----
tests/qemu-iotests/qed.py | 17 ++---
tests/vm/basevm.py | 3 +-
32 files changed, 281 insertions(+), 256 deletions(-)
diff --git a/scripts/analyse-9p-simpletrace.py b/scripts/analyse-9p-simpletrace.py
index 3c3dee4337..710e01adba 100755
--- a/scripts/analyse-9p-simpletrace.py
+++ b/scripts/analyse-9p-simpletrace.py
@@ -3,6 +3,7 @@
# Usage: ./analyse-9p-simpletrace <trace-events> <trace-pid>
#
# Author: Harsh Prateek Bora
+from __future__ import print_function
import os
import simpletrace
@@ -79,135 +80,135 @@ symbol_9p = {
class VirtFSRequestTracker(simpletrace.Analyzer):
def begin(self):
- print "Pretty printing 9p simpletrace log ..."
+ print("Pretty printing 9p simpletrace log ...")
def v9fs_rerror(self, tag, id, err):
- print "RERROR (tag =", tag, ", id =", symbol_9p[id], ", err = \"", os.strerror(err), "\")"
+ print("RERROR (tag =", tag, ", id =", symbol_9p[id], ", err = \"", os.strerror(err), "\")")
def v9fs_version(self, tag, id, msize, version):
- print "TVERSION (tag =", tag, ", msize =", msize, ", version =", version, ")"
+ print("TVERSION (tag =", tag, ", msize =", msize, ", version =", version, ")")
def v9fs_version_return(self, tag, id, msize, version):
- print "RVERSION (tag =", tag, ", msize =", msize, ", version =", version, ")"
+ print("RVERSION (tag =", tag, ", msize =", msize, ", version =", version, ")")
def v9fs_attach(self, tag, id, fid, afid, uname, aname):
- print "TATTACH (tag =", tag, ", fid =", fid, ", afid =", afid, ", uname =", uname, ", aname =", aname, ")"
+ print("TATTACH (tag =", tag, ", fid =", fid, ", afid =", afid, ", uname =", uname, ", aname =", aname, ")")
def v9fs_attach_return(self, tag, id, type, version, path):
- print "RATTACH (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "})"
+ print("RATTACH (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "})")
def v9fs_stat(self, tag, id, fid):
- print "TSTAT (tag =", tag, ", fid =", fid, ")"
+ print("TSTAT (tag =", tag, ", fid =", fid, ")")
def v9fs_stat_return(self, tag, id, mode, atime, mtime, length):
- print "RSTAT (tag =", tag, ", mode =", mode, ", atime =", atime, ", mtime =", mtime, ", length =", length, ")"
+ print("RSTAT (tag =", tag, ", mode =", mode, ", atime =", atime, ", mtime =", mtime, ", length =", length, ")")
def v9fs_getattr(self, tag, id, fid, request_mask):
- print "TGETATTR (tag =", tag, ", fid =", fid, ", request_mask =", hex(request_mask), ")"
+ print("TGETATTR (tag =", tag, ", fid =", fid, ", request_mask =", hex(request_mask), ")")
def v9fs_getattr_return(self, tag, id, result_mask, mode, uid, gid):
- print "RGETATTR (tag =", tag, ", result_mask =", hex(result_mask), ", mode =", oct(mode), ", uid =", uid, ", gid =", gid, ")"
+ print("RGETATTR (tag =", tag, ", result_mask =", hex(result_mask), ", mode =", oct(mode), ", uid =", uid, ", gid =", gid, ")")
def v9fs_walk(self, tag, id, fid, newfid, nwnames):
- print "TWALK (tag =", tag, ", fid =", fid, ", newfid =", newfid, ", nwnames =", nwnames, ")"
+ print("TWALK (tag =", tag, ", fid =", fid, ", newfid =", newfid, ", nwnames =", nwnames, ")")
def v9fs_walk_return(self, tag, id, nwnames, qids):
- print "RWALK (tag =", tag, ", nwnames =", nwnames, ", qids =", hex(qids), ")"
+ print("RWALK (tag =", tag, ", nwnames =", nwnames, ", qids =", hex(qids), ")")
def v9fs_open(self, tag, id, fid, mode):
- print "TOPEN (tag =", tag, ", fid =", fid, ", mode =", oct(mode), ")"
+ print("TOPEN (tag =", tag, ", fid =", fid, ", mode =", oct(mode), ")")
def v9fs_open_return(self, tag, id, type, version, path, iounit):
- print "ROPEN (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "}, iounit =", iounit, ")"
+ print("ROPEN (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "}, iounit =", iounit, ")")
def v9fs_lcreate(self, tag, id, dfid, flags, mode, gid):
- print "TLCREATE (tag =", tag, ", dfid =", dfid, ", flags =", oct(flags), ", mode =", oct(mode), ", gid =", gid, ")"
+ print("TLCREATE (tag =", tag, ", dfid =", dfid, ", flags =", oct(flags), ", mode =", oct(mode), ", gid =", gid, ")")
def v9fs_lcreate_return(self, tag, id, type, version, path, iounit):
- print "RLCREATE (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "}, iounit =", iounit, ")"
+ print("RLCREATE (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "}, iounit =", iounit, ")")
def v9fs_fsync(self, tag, id, fid, datasync):
- print "TFSYNC (tag =", tag, ", fid =", fid, ", datasync =", datasync, ")"
+ print("TFSYNC (tag =", tag, ", fid =", fid, ", datasync =", datasync, ")")
def v9fs_clunk(self, tag, id, fid):
- print "TCLUNK (tag =", tag, ", fid =", fid, ")"
+ print("TCLUNK (tag =", tag, ", fid =", fid, ")")
def v9fs_read(self, tag, id, fid, off, max_count):
- print "TREAD (tag =", tag, ", fid =", fid, ", off =", off, ", max_count =", max_count, ")"
+ print("TREAD (tag =", tag, ", fid =", fid, ", off =", off, ", max_count =", max_count, ")")
def v9fs_read_return(self, tag, id, count, err):
- print "RREAD (tag =", tag, ", count =", count, ", err =", err, ")"
+ print("RREAD (tag =", tag, ", count =", count, ", err =", err, ")")
def v9fs_readdir(self, tag, id, fid, offset, max_count):
- print "TREADDIR (tag =", tag, ", fid =", fid, ", offset =", offset, ", max_count =", max_count, ")"
+ print("TREADDIR (tag =", tag, ", fid =", fid, ", offset =", offset, ", max_count =", max_count, ")")
def v9fs_readdir_return(self, tag, id, count, retval):
- print "RREADDIR (tag =", tag, ", count =", count, ", retval =", retval, ")"
+ print("RREADDIR (tag =", tag, ", count =", count, ", retval =", retval, ")")
def v9fs_write(self, tag, id, fid, off, count, cnt):
- print "TWRITE (tag =", tag, ", fid =", fid, ", off =", off, ", count =", count, ", cnt =", cnt, ")"
+ print("TWRITE (tag =", tag, ", fid =", fid, ", off =", off, ", count =", count, ", cnt =", cnt, ")")
def v9fs_write_return(self, tag, id, total, err):
- print "RWRITE (tag =", tag, ", total =", total, ", err =", err, ")"
+ print("RWRITE (tag =", tag, ", total =", total, ", err =", err, ")")
def v9fs_create(self, tag, id, fid, name, perm, mode):
- print "TCREATE (tag =", tag, ", fid =", fid, ", perm =", oct(perm), ", name =", name, ", mode =", oct(mode), ")"
+ print("TCREATE (tag =", tag, ", fid =", fid, ", perm =", oct(perm), ", name =", name, ", mode =", oct(mode), ")")
def v9fs_create_return(self, tag, id, type, version, path, iounit):
- print "RCREATE (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "}, iounit =", iounit, ")"
+ print("RCREATE (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "}, iounit =", iounit, ")")
def v9fs_symlink(self, tag, id, fid, name, symname, gid):
- print "TSYMLINK (tag =", tag, ", fid =", fid, ", name =", name, ", symname =", symname, ", gid =", gid, ")"
+ print("TSYMLINK (tag =", tag, ", fid =", fid, ", name =", name, ", symname =", symname, ", gid =", gid, ")")
def v9fs_symlink_return(self, tag, id, type, version, path):
- print "RSYMLINK (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "})"
+ print("RSYMLINK (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "})")
def v9fs_flush(self, tag, id, flush_tag):
- print "TFLUSH (tag =", tag, ", flush_tag =", flush_tag, ")"
+ print("TFLUSH (tag =", tag, ", flush_tag =", flush_tag, ")")
def v9fs_link(self, tag, id, dfid, oldfid, name):
- print "TLINK (tag =", tag, ", dfid =", dfid, ", oldfid =", oldfid, ", name =", name, ")"
+ print("TLINK (tag =", tag, ", dfid =", dfid, ", oldfid =", oldfid, ", name =", name, ")")
def v9fs_remove(self, tag, id, fid):
- print "TREMOVE (tag =", tag, ", fid =", fid, ")"
+ print("TREMOVE (tag =", tag, ", fid =", fid, ")")
def v9fs_wstat(self, tag, id, fid, mode, atime, mtime):
- print "TWSTAT (tag =", tag, ", fid =", fid, ", mode =", oct(mode), ", atime =", atime, "mtime =", mtime, ")"
+ print("TWSTAT (tag =", tag, ", fid =", fid, ", mode =", oct(mode), ", atime =", atime, "mtime =", mtime, ")")
def v9fs_mknod(self, tag, id, fid, mode, major, minor):
- print "TMKNOD (tag =", tag, ", fid =", fid, ", mode =", oct(mode), ", major =", major, ", minor =", minor, ")"
+ print("TMKNOD (tag =", tag, ", fid =", fid, ", mode =", oct(mode), ", major =", major, ", minor =", minor, ")")
def v9fs_lock(self, tag, id, fid, type, start, length):
- print "TLOCK (tag =", tag, ", fid =", fid, "type =", type, ", start =", start, ", length =", length, ")"
+ print("TLOCK (tag =", tag, ", fid =", fid, "type =", type, ", start =", start, ", length =", length, ")")
def v9fs_lock_return(self, tag, id, status):
- print "RLOCK (tag =", tag, ", status =", status, ")"
+ print("RLOCK (tag =", tag, ", status =", status, ")")
def v9fs_getlock(self, tag, id, fid, type, start, length):
- print "TGETLOCK (tag =", tag, ", fid =", fid, "type =", type, ", start =", start, ", length =", length, ")"
+ print("TGETLOCK (tag =", tag, ", fid =", fid, "type =", type, ", start =", start, ", length =", length, ")")
def v9fs_getlock_return(self, tag, id, type, start, length, proc_id):
- print "RGETLOCK (tag =", tag, "type =", type, ", start =", start, ", length =", length, ", proc_id =", proc_id, ")"
+ print("RGETLOCK (tag =", tag, "type =", type, ", start =", start, ", length =", length, ", proc_id =", proc_id, ")")
def v9fs_mkdir(self, tag, id, fid, name, mode, gid):
- print "TMKDIR (tag =", tag, ", fid =", fid, ", name =", name, ", mode =", mode, ", gid =", gid, ")"
+ print("TMKDIR (tag =", tag, ", fid =", fid, ", name =", name, ", mode =", mode, ", gid =", gid, ")")
def v9fs_mkdir_return(self, tag, id, type, version, path, err):
- print "RMKDIR (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "}, err =", err, ")"
+ print("RMKDIR (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "}, err =", err, ")")
def v9fs_xattrwalk(self, tag, id, fid, newfid, name):
- print "TXATTRWALK (tag =", tag, ", fid =", fid, ", newfid =", newfid, ", xattr name =", name, ")"
+ print("TXATTRWALK (tag =", tag, ", fid =", fid, ", newfid =", newfid, ", xattr name =", name, ")")
def v9fs_xattrwalk_return(self, tag, id, size):
- print "RXATTRWALK (tag =", tag, ", xattrsize =", size, ")"
+ print("RXATTRWALK (tag =", tag, ", xattrsize =", size, ")")
def v9fs_xattrcreate(self, tag, id, fid, name, size, flags):
- print "TXATTRCREATE (tag =", tag, ", fid =", fid, ", name =", name, ", xattrsize =", size, ", flags =", flags, ")"
+ print("TXATTRCREATE (tag =", tag, ", fid =", fid, ", name =", name, ", xattrsize =", size, ", flags =", flags, ")")
def v9fs_readlink(self, tag, id, fid):
- print "TREADLINK (tag =", tag, ", fid =", fid, ")"
+ print("TREADLINK (tag =", tag, ", fid =", fid, ")")
def v9fs_readlink_return(self, tag, id, target):
- print "RREADLINK (tag =", tag, ", target =", target, ")"
+ print("RREADLINK (tag =", tag, ", target =", target, ")")
simpletrace.run(VirtFSRequestTracker())
diff --git a/scripts/analyse-locks-simpletrace.py b/scripts/analyse-locks-simpletrace.py
index 101e84dea5..352bc9c22d 100755
--- a/scripts/analyse-locks-simpletrace.py
+++ b/scripts/analyse-locks-simpletrace.py
@@ -6,6 +6,7 @@
# Author: Alex Bennée <alex.bennee@linaro.org>
#
+from __future__ import print_function
import os
import simpletrace
import argparse
diff --git a/scripts/analyze-migration.py b/scripts/analyze-migration.py
index 88ff4adb30..5c2010c917 100755
--- a/scripts/analyze-migration.py
+++ b/scripts/analyze-migration.py
@@ -17,6 +17,7 @@
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, see <http://www.gnu.org/licenses/>.
+from __future__ import print_function
import numpy as np
import json
import os
@@ -162,7 +163,7 @@ class RamSection(object):
len = self.file.read64()
self.sizeinfo[self.name] = '0x%016x' % len
if self.write_memory:
- print self.name
+ print(self.name)
mkdir_p('./' + os.path.dirname(self.name))
f = open('./' + self.name, "wb")
f.truncate(0)
@@ -588,7 +589,7 @@ if args.extract:
dump = MigrationDump(args.file)
dump.read(desc_only = True)
- print "desc.json"
+ print("desc.json")
f = open("desc.json", "wb")
f.truncate()
f.write(jsonenc.encode(dump.vmsd_desc))
@@ -596,7 +597,7 @@ if args.extract:
dump.read(write_memory = True)
dict = dump.getDict()
- print "state.json"
+ print("state.json")
f = open("state.json", "wb")
f.truncate()
f.write(jsonenc.encode(dict))
@@ -605,10 +606,10 @@ elif args.dump == "state":
dump = MigrationDump(args.file)
dump.read(dump_memory = args.memory)
dict = dump.getDict()
- print jsonenc.encode(dict)
+ print(jsonenc.encode(dict))
elif args.dump == "desc":
dump = MigrationDump(args.file)
dump.read(desc_only = True)
- print jsonenc.encode(dump.vmsd_desc)
+ print(jsonenc.encode(dump.vmsd_desc))
else:
raise Exception("Please specify either -x, -d state or -d dump")
diff --git a/scripts/dump-guest-memory.py b/scripts/dump-guest-memory.py
index 276eebf0c2..5a857cebcf 100644
--- a/scripts/dump-guest-memory.py
+++ b/scripts/dump-guest-memory.py
@@ -12,6 +12,7 @@ Authors:
This work is licensed under the terms of the GNU GPL, version 2 or later. See
the COPYING file in the top-level directory.
"""
+from __future__ import print_function
import ctypes
import struct
diff --git a/scripts/replay-dump.py b/scripts/replay-dump.py
index e274086277..5ae77c8a92 100755
--- a/scripts/replay-dump.py
+++ b/scripts/replay-dump.py
@@ -18,6 +18,7 @@
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, see <http://www.gnu.org/licenses/>.
+from __future__ import print_function
import argparse
import struct
from collections import namedtuple
@@ -89,9 +90,9 @@ def call_decode(table, index, dumpfile):
"Search decode table for next step"
decoder = next((d for d in table if d.eid == index), None)
if not decoder:
- print "Could not decode index: %d" % (index)
- print "Entry is: %s" % (decoder)
- print "Decode Table is:\n%s" % (table)
+ print("Could not decode index: %d" % (index))
+ print("Entry is: %s" % (decoder))
+ print("Decode Table is:\n%s" % (table))
return False
else:
return decoder.fn(decoder.eid, decoder.name, dumpfile)
@@ -103,23 +104,23 @@ def print_event(eid, name, string=None, event_count=None):
event_count = replay_state.event_count
if string:
- print "%d:%s(%d) %s" % (event_count, name, eid, string)
+ print("%d:%s(%d) %s" % (event_count, name, eid, string))
else:
- print "%d:%s(%d)" % (event_count, name, eid)
+ print("%d:%s(%d)" % (event_count, name, eid))
# Decoders for each event type
def decode_unimp(eid, name, _unused_dumpfile):
"Unimplimented decoder, will trigger exit"
- print "%s not handled - will now stop" % (name)
+ print("%s not handled - will now stop" % (name))
return False
# Checkpoint decoder
def swallow_async_qword(eid, name, dumpfile):
"Swallow a qword of data without looking at it"
step_id = read_qword(dumpfile)
- print " %s(%d) @ %d" % (name, eid, step_id)
+ print(" %s(%d) @ %d" % (name, eid, step_id))
return True
async_decode_table = [ Decoder(0, "REPLAY_ASYNC_EVENT_BH", swallow_async_qword),
@@ -139,8 +140,8 @@ def decode_async(eid, name, dumpfile):
async_event_checkpoint = read_byte(dumpfile)
if async_event_checkpoint != replay_state.current_checkpoint:
- print " mismatch between checkpoint %d and async data %d" % (
- replay_state.current_checkpoint, async_event_checkpoint)
+ print(" mismatch between checkpoint %d and async data %d" % (
+ replay_state.current_checkpoint, async_event_checkpoint))
return True
return call_decode(async_decode_table, async_event_kind, dumpfile)
@@ -283,7 +284,7 @@ def decode_file(filename):
version = read_dword(dumpfile)
junk = read_qword(dumpfile)
- print "HEADER: version 0x%x" % (version)
+ print("HEADER: version 0x%x" % (version))
if version == 0xe02007:
event_decode_table = v7_event_table
diff --git a/scripts/signrom.py b/scripts/signrom.py
index 0497a1c32e..313ee28a17 100644
--- a/scripts/signrom.py
+++ b/scripts/signrom.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
#
# Option ROM signing utility
#
diff --git a/scripts/simpletrace.py b/scripts/simpletrace.py
index 9d45c6ba4e..2658b5cc7c 100755
--- a/scripts/simpletrace.py
+++ b/scripts/simpletrace.py
@@ -9,6 +9,7 @@
#
# For help see docs/devel/tracing.txt
+from __future__ import print_function
import struct
import re
import inspect
@@ -257,6 +258,6 @@ if __name__ == '__main__':
else:
fields.append('%s=0x%x' % (name, rec[i]))
i += 1
- print ' '.join(fields)
+ print(' '.join(fields))
run(Formatter())
diff --git a/scripts/vmstate-static-checker.py b/scripts/vmstate-static-checker.py
index bcef7ee28e..60d1bf4cda 100755
--- a/scripts/vmstate-static-checker.py
+++ b/scripts/vmstate-static-checker.py
@@ -19,6 +19,7 @@
# You should have received a copy of the GNU General Public License along
# with this program; if not, see <http://www.gnu.org/licenses/>.
+from __future__ import print_function
import argparse
import json
import sys
@@ -176,10 +177,10 @@ def check_fields(src_fields, dest_fields, desc, sec):
except StopIteration:
if d_iter_list == []:
# We were not in a substruct
- print "Section \"" + sec + "\",",
- print "Description " + "\"" + desc + "\":",
- print "expected field \"" + s_item["field"] + "\",",
- print "while dest has no further fields"
+ print("Section \"" + sec + "\",", end=' ')
+ print("Description " + "\"" + desc + "\":", end=' ')
+ print("expected field \"" + s_item["field"] + "\",", end=' ')
+ print("while dest has no further fields")
bump_taint()
break
@@ -197,10 +198,10 @@ def check_fields(src_fields, dest_fields, desc, sec):
advance_dest = True
continue
if unused_count < 0:
- print "Section \"" + sec + "\",",
- print "Description \"" + desc + "\":",
- print "unused size mismatch near \"",
- print s_item["field"] + "\""
+ print("Section \"" + sec + "\",", end=' ')
+ print("Description \"" + desc + "\":", end=' ')
+ print("unused size mismatch near \"", end=' ')
+ print(s_item["field"] + "\"")
bump_taint()
break
continue
@@ -211,10 +212,10 @@ def check_fields(src_fields, dest_fields, desc, sec):
advance_src = True
continue
if unused_count < 0:
- print "Section \"" + sec + "\",",
- print "Description \"" + desc + "\":",
- print "unused size mismatch near \"",
- print d_item["field"] + "\""
+ print("Section \"" + sec + "\",", end=' ')
+ print("Description \"" + desc + "\":", end=' ')
+ print("unused size mismatch near \"", end=' ')
+ print(d_item["field"] + "\"")
bump_taint()
break
continue
@@ -262,10 +263,10 @@ def check_fields(src_fields, dest_fields, desc, sec):
unused_count = s_item["size"] - d_item["size"]
continue
- print "Section \"" + sec + "\",",
- print "Description \"" + desc + "\":",
- print "expected field \"" + s_item["field"] + "\",",
- print "got \"" + d_item["field"] + "\"; skipping rest"
+ print("Section \"" + sec + "\",", end=' ')
+ print("Description \"" + desc + "\":", end=' ')
+ print("expected field \"" + s_item["field"] + "\",", end=' ')
+ print("got \"" + d_item["field"] + "\"; skipping rest")
bump_taint()
break
@@ -289,8 +290,8 @@ def check_subsections(src_sub, dest_sub, desc, sec):
check_descriptions(s_item, d_item, sec)
if not found:
- print "Section \"" + sec + "\", Description \"" + desc + "\":",
- print "Subsection \"" + s_item["name"] + "\" not found"
+ print("Section \"" + sec + "\", Description \"" + desc + "\":", end=' ')
+ print("Subsection \"" + s_item["name"] + "\" not found")
bump_taint()
@@ -299,8 +300,8 @@ def check_description_in_list(s_item, d_item, sec, desc):
return
if not "Description" in d_item:
- print "Section \"" + sec + "\", Description \"" + desc + "\",",
- print "Field \"" + s_item["field"] + "\": missing description"
+ print("Section \"" + sec + "\", Description \"" + desc + "\",", end=' ')
+ print("Field \"" + s_item["field"] + "\": missing description")
bump_taint()
return
@@ -311,17 +312,17 @@ def check_descriptions(src_desc, dest_desc, sec):
check_version(src_desc, dest_desc, sec, src_desc["name"])
if not check_fields_match(sec, src_desc["name"], dest_desc["name"]):
- print "Section \"" + sec + "\":",
- print "Description \"" + src_desc["name"] + "\"",
- print "missing, got \"" + dest_desc["name"] + "\" instead; skipping"
+ print("Section \"" + sec + "\":", end=' ')
+ print("Description \"" + src_desc["name"] + "\"", end=' ')
+ print("missing, got \"" + dest_desc["name"] + "\" instead; skipping")
bump_taint()
return
for f in src_desc:
if not f in dest_desc:
- print "Section \"" + sec + "\"",
- print "Description \"" + src_desc["name"] + "\":",
- print "Entry \"" + f + "\" missing"
+ print("Section \"" + sec + "\"", end=' ')
+ print("Description \"" + src_desc["name"] + "\":", end=' ')
+ print("Entry \"" + f + "\" missing")
bump_taint()
continue
@@ -334,39 +335,39 @@ def check_descriptions(src_desc, dest_desc, sec):
def check_version(s, d, sec, desc=None):
if s["version_id"] > d["version_id"]:
- print "Section \"" + sec + "\"",
+ print("Section \"" + sec + "\"", end=' ')
if desc:
- print "Description \"" + desc + "\":",
- print "version error:", s["version_id"], ">", d["version_id"]
+ print("Description \"" + desc + "\":", end=' ')
+ print("version error:", s["version_id"], ">", d["version_id"])
bump_taint()
if not "minimum_version_id" in d:
return
if s["version_id"] < d["minimum_version_id"]:
- print "Section \"" + sec + "\"",
+ print("Section \"" + sec + "\"", end=' ')
if desc:
- print "Description \"" + desc + "\":",
- print "minimum version error:", s["version_id"], "<",
- print d["minimum_version_id"]
+ print("Description \"" + desc + "\":", end=' ')
+ print("minimum version error:", s["version_id"], "<", end=' ')
+ print(d["minimum_version_id"])
bump_taint()
def check_size(s, d, sec, desc=None, field=None):
if s["size"] != d["size"]:
- print "Section \"" + sec + "\"",
+ print("Section \"" + sec + "\"", end=' ')
if desc:
- print "Description \"" + desc + "\"",
+ print("Description \"" + desc + "\"", end=' ')
if field:
- print "Field \"" + field + "\"",
- print "size mismatch:", s["size"], ",", d["size"]
+ print("Field \"" + field + "\"", end=' ')
+ print("size mismatch:", s["size"], ",", d["size"])
bump_taint()
def check_machine_type(s, d):
if s["Name"] != d["Name"]:
- print "Warning: checking incompatible machine types:",
- print "\"" + s["Name"] + "\", \"" + d["Name"] + "\""
+ print("Warning: checking incompatible machine types:", end=' ')
+ print("\"" + s["Name"] + "\", \"" + d["Name"] + "\"")
return
@@ -400,7 +401,7 @@ def main():
# doesn't exist in dest.
dest_sec = get_changed_sec_name(sec)
if not dest_sec in dest_data:
- print "Section \"" + sec + "\" does not exist in dest"
+ print("Section \"" + sec + "\" does not exist in dest")
bump_taint()
continue
@@ -415,8 +416,8 @@ def main():
for entry in s:
if not entry in d:
- print "Section \"" + sec + "\": Entry \"" + entry + "\"",
- print "missing"
+ print("Section \"" + sec + "\": Entry \"" + entry + "\"", end=' ')
+ print("missing")
bump_taint()
continue
diff --git a/scripts/device-crash-test b/scripts/device-crash-test
index b3ce72069f..e6c233e9bf 100755
--- a/scripts/device-crash-test
+++ b/scripts/device-crash-test
@@ -23,6 +23,7 @@
Run QEMU with all combinations of -machine and -device types,
check for crashes and unexpected errors.
"""
+from __future__ import print_function
import sys
import os
@@ -554,7 +555,7 @@ def main():
tc[k] = v
if len(binariesToTest(args, tc)) == 0:
- print >>sys.stderr, "No QEMU binary found"
+ print("No QEMU binary found", file=sys.stderr)
parser.print_usage(sys.stderr)
return 1
diff --git a/scripts/kvm/kvm_flightrecorder b/scripts/kvm/kvm_flightrecorder
index 7fb1c2d1a7..54a56745e4 100755
--- a/scripts/kvm/kvm_flightrecorder
+++ b/scripts/kvm/kvm_flightrecorder
@@ -32,6 +32,7 @@
# consuming CPU cycles. No disk I/O is performed since the ring buffer holds a
# fixed-size in-memory trace.
+from __future__ import print_function
import sys
import os
@@ -77,8 +78,8 @@ def tail_trace():
pass
def usage():
- print 'Usage: %s start [buffer_size_kb] | stop | dump | tail' % sys.argv[0]
- print 'Control the KVM flight recorder tracing.'
+ print('Usage: %s start [buffer_size_kb] | stop | dump | tail' % sys.argv[0])
+ print('Control the KVM flight recorder tracing.')
sys.exit(0)
def main():
@@ -87,15 +88,15 @@ def main():
cmd = sys.argv[1]
if cmd == '--version':
- print 'kvm_flightrecorder version 1.0'
+ print('kvm_flightrecorder version 1.0')
sys.exit(0)
if not os.path.isdir(tracing_dir):
- print 'Unable to tracing debugfs directory, try:'
- print 'mount -t debugfs none /sys/kernel/debug'
+ print('Unable to tracing debugfs directory, try:')
+ print('mount -t debugfs none /sys/kernel/debug')
sys.exit(1)
if not os.access(tracing_dir, os.W_OK):
- print 'Unable to write to tracing debugfs directory, please run as root'
+ print('Unable to write to tracing debugfs directory, please run as root')
sys.exit(1)
if cmd == 'start':
@@ -105,16 +106,16 @@ def main():
try:
buffer_size_kb = int(sys.argv[2])
except ValueError:
- print 'Invalid per-cpu trace buffer size in KB'
+ print('Invalid per-cpu trace buffer size in KB')
sys.exit(1)
write_file(trace_path('buffer_size_kb'), str(buffer_size_kb))
- print 'Per-CPU ring buffer size set to %d KB' % buffer_size_kb
+ print('Per-CPU ring buffer size set to %d KB' % buffer_size_kb)
start_tracing()
- print 'KVM flight recorder enabled'
+ print('KVM flight recorder enabled')
elif cmd == 'stop':
stop_tracing()
- print 'KVM flight recorder disabled'
+ print('KVM flight recorder disabled')
elif cmd == 'dump':
dump_trace()
elif cmd == 'tail':
diff --git a/scripts/kvm/vmxcap b/scripts/kvm/vmxcap
index d9a6db0bb7..99a8146aaa 100755
--- a/scripts/kvm/vmxcap
+++ b/scripts/kvm/vmxcap
@@ -10,6 +10,7 @@
# This work is licensed under the terms of the GNU GPL, version 2. See
# the COPYING file in the top-level directory.
+from __future__ import print_function
MSR_IA32_VMX_BASIC = 0x480
MSR_IA32_VMX_PINBASED_CTLS = 0x481
MSR_IA32_VMX_PROCBASED_CTLS = 0x482
diff --git a/scripts/qmp/qemu-ga-client b/scripts/qmp/qemu-ga-client
index 7d2a472094..8510814683 100755
--- a/scripts/qmp/qemu-ga-client
+++ b/scripts/qmp/qemu-ga-client
@@ -36,6 +36,7 @@
# See also: https://wiki.qemu.org/Features/QAPI/GuestAgent
#
+from __future__ import print_function
import base64
import random
diff --git a/scripts/qmp/qmp b/scripts/qmp/qmp
index 514b539a6b..16d3bdb6fe 100755
--- a/scripts/qmp/qmp
+++ b/scripts/qmp/qmp
@@ -10,6 +10,7 @@
# This work is licensed under the terms of the GNU GPLv2 or later.
# See the COPYING file in the top-level directory.
+from __future__ import print_function
import sys, os
from qmp import QEMUMonitorProtocol
@@ -26,9 +27,9 @@ def print_response(rsp, prefix=[]):
print_response(rsp[key], prefix + [key])
else:
if len(prefix):
- print '%s: %s' % ('.'.join(prefix), rsp)
+ print('%s: %s' % ('.'.join(prefix), rsp))
else:
- print '%s' % (rsp)
+ print('%s' % (rsp))
def main(args):
path = None
@@ -53,21 +54,21 @@ def main(args):
elif arg in ['help']:
os.execlp('man', 'man', 'qmp')
else:
- print 'Unknown argument "%s"' % arg
+ print('Unknown argument "%s"' % arg)
args = args[1:]
else:
break
if not path:
- print "QMP path isn't set, use --path=qmp-monitor-address or set QMP_PATH"
+ print("QMP path isn't set, use --path=qmp-monitor-address or set QMP_PATH")
return 1
if len(args):
command, args = args[0], args[1:]
else:
- print 'No command found'
- print 'Usage: "qmp [--path=qmp-monitor-address] qmp-cmd arguments"'
+ print('No command found')
+ print('Usage: "qmp [--path=qmp-monitor-address] qmp-cmd arguments"')
return 1
if command in ['help']:
@@ -93,7 +94,7 @@ def main(args):
os.execvp(fullcmd, [fullcmd] + args)
except OSError as exc:
if exc.errno == 2:
- print 'Command "%s" not found.' % (fullcmd)
+ print('Command "%s" not found.' % (fullcmd))
return 1
raise
return 0
@@ -104,7 +105,7 @@ def main(args):
arguments = {}
for arg in args:
if not arg.startswith('--'):
- print 'Unknown argument "%s"' % arg
+ print('Unknown argument "%s"' % arg)
return 1
arg = arg[2:]
diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell
index be449de621..b1cc7e2271 100755
--- a/scripts/qmp/qmp-shell
+++ b/scripts/qmp/qmp-shell
@@ -65,6 +65,7 @@
# which will echo back the properly formatted JSON-compliant QMP that is being
# sent to QEMU, which is useful for debugging and documentation generation.
+from __future__ import print_function
import qmp
import json
import ast
@@ -153,14 +154,14 @@ class QMPShell(qmp.QEMUMonitorProtocol):
# File not found. No problem.
pass
else:
- print "Failed to read history '%s'; %s" % (self._histfile, e)
+ print("Failed to read history '%s'; %s" % (self._histfile, e))
atexit.register(self.__save_history)
def __save_history(self):
try:
readline.write_history_file(self._histfile)
except Exception as e:
- print "Failed to save history file '%s'; %s" % (self._histfile, e)
+ print("Failed to save history file '%s'; %s" % (self._histfile, e))
def __parse_value(self, val):
try:
@@ -258,15 +259,15 @@ class QMPShell(qmp.QEMUMonitorProtocol):
if self._pretty:
indent = 4
jsobj = json.dumps(qmp, indent=indent)
- print str(jsobj)
+ print(str(jsobj))
def _execute_cmd(self, cmdline):
try:
qmpcmd = self.__build_cmd(cmdline)
except Exception as e:
- print 'Error while parsing command line: %s' % e
- print 'command format: <command-name> ',
- print '[arg-name1=arg1] ... [arg-nameN=argN]'
+ print('Error while parsing command line: %s' % e)
+ print('command format: <command-name> ', end=' ')
+ print('[arg-name1=arg1] ... [arg-nameN=argN]')
return True
# For transaction mode, we may have just cached the action:
if qmpcmd is None:
@@ -275,7 +276,7 @@ class QMPShell(qmp.QEMUMonitorProtocol):
self._print(qmpcmd)
resp = self.cmd_obj(qmpcmd)
if resp is None:
- print 'Disconnected'
+ print('Disconnected')
return False
self._print(resp)
return True
@@ -285,12 +286,12 @@ class QMPShell(qmp.QEMUMonitorProtocol):
self.__completer_setup()
def show_banner(self, msg='Welcome to the QMP low-level shell!'):
- print msg
+ print(msg)
if not self._greeting:
- print 'Connected'
+ print('Connected')
return
version = self._greeting['QMP']['version']['qemu']
- print 'Connected to QEMU %d.%d.%d\n' % (version['major'],version['minor'],version['micro'])
+ print('Connected to QEMU %d.%d.%d\n' % (version['major'],version['minor'],version['micro']))
def get_prompt(self):
if self._transmode:
@@ -306,11 +307,11 @@ class QMPShell(qmp.QEMUMonitorProtocol):
try:
cmdline = raw_input(prompt)
except EOFError:
- print
+ print()
return False
if cmdline == '':
for ev in self.get_events():
- print ev
+ print(ev)
self.clear_events()
return True
else:
@@ -366,24 +367,24 @@ class HMPShell(QMPShell):
try:
idx = int(cmdline.split()[1])
if not 'return' in self.__cmd_passthrough('info version', idx):
- print 'bad CPU index'
+ print('bad CPU index')
return True
self.__cpu_index = idx
except ValueError:
- print 'cpu command takes an integer argument'
+ print('cpu command takes an integer argument')
return True
resp = self.__cmd_passthrough(cmdline, self.__cpu_index)
if resp is None:
- print 'Disconnected'
+ print('Disconnected')
return False
assert 'return' in resp or 'error' in resp
if 'return' in resp:
# Success
if len(resp['return']) > 0:
- print resp['return'],
+ print(resp['return'], end=' ')
else:
# Error
- print '%s: %s' % (resp['error']['class'], resp['error']['desc'])
+ print('%s: %s' % (resp['error']['class'], resp['error']['desc']))
return True
def show_banner(self):
diff --git a/scripts/qmp/qom-get b/scripts/qmp/qom-get
index 0172c69441..291c8bfbc2 100755
--- a/scripts/qmp/qom-get
+++ b/scripts/qmp/qom-get
@@ -11,6 +11,7 @@
# the COPYING file in the top-level directory.
##
+from __future__ import print_function
import sys
import os
from qmp import QEMUMonitorProtocol
@@ -33,7 +34,7 @@ def usage_error(error_msg = "unspecified error"):
if len(args) > 0:
if args[0] == "-h":
- print usage()
+ print(usage())
exit(0);
elif args[0] == "-s":
try:
@@ -62,6 +63,6 @@ srv.connect()
rsp = srv.command('qom-get', path=path, property=prop)
if type(rsp) == dict:
for i in rsp.keys():
- print '%s: %s' % (i, rsp[i])
+ print('%s: %s' % (i, rsp[i]))
else:
- print rsp
+ print(rsp)
diff --git a/scripts/qmp/qom-list b/scripts/qmp/qom-list
index 1e7cc6cb2d..cd907bb81f 100755
--- a/scripts/qmp/qom-list
+++ b/scripts/qmp/qom-list
@@ -11,6 +11,7 @@
# the COPYING file in the top-level directory.
##
+from __future__ import print_function
import sys
import os
from qmp import QEMUMonitorProtocol
@@ -33,7 +34,7 @@ def usage_error(error_msg = "unspecified error"):
if len(args) > 0:
if args[0] == "-h":
- print usage()
+ print(usage())
exit(0);
elif args[0] == "-s":
try:
@@ -52,13 +53,13 @@ srv = QEMUMonitorProtocol(socket_path)
srv.connect()
if len(args) == 0:
- print '/'
+ print('/')
sys.exit(0)
for item in srv.command('qom-list', path=args[0]):
if item['type'].startswith('child<'):
- print '%s/' % item['name']
+ print('%s/' % item['name'])
elif item['type'].startswith('link<'):
- print '@%s/' % item['name']
+ print('@%s/' % item['name'])
else:
- print '%s' % item['name']
+ print('%s' % item['name'])
diff --git a/scripts/qmp/qom-set b/scripts/qmp/qom-set
index 94e2778922..fbe4b3e471 100755
--- a/scripts/qmp/qom-set
+++ b/scripts/qmp/qom-set
@@ -11,6 +11,7 @@
# the COPYING file in the top-level directory.
##
+from __future__ import print_function
import sys
import os
from qmp import QEMUMonitorProtocol
@@ -34,7 +35,7 @@ def usage_error(error_msg = "unspecified error"):
if len(args) > 0:
if args[0] == "-h":
- print usage()
+ print(usage())
exit(0);
elif args[0] == "-s":
try:
@@ -61,4 +62,4 @@ else:
srv = QEMUMonitorProtocol(socket_path)
srv.connect()
-print srv.command('qom-set', path=path, property=prop, value=value)
+print(srv.command('qom-set', path=path, property=prop, value=value))
diff --git a/scripts/qmp/qom-tree b/scripts/qmp/qom-tree
index 906fcd2640..0ffd1ff1de 100755
--- a/scripts/qmp/qom-tree
+++ b/scripts/qmp/qom-tree
@@ -13,6 +13,7 @@
# the COPYING file in the top-level directory.
##
+from __future__ import print_function
import sys
import os
from qmp import QEMUMonitorProtocol
@@ -35,7 +36,7 @@ def usage_error(error_msg = "unspecified error"):
if len(args) > 0:
if args[0] == "-h":
- print usage()
+ print(usage())
exit(0);
elif args[0] == "-s":
try:
@@ -54,15 +55,15 @@ srv = QEMUMonitorProtocol(socket_path)
srv.connect()
def list_node(path):
- print '%s' % path
+ print('%s' % path)
items = srv.command('qom-list', path=path)
for item in items:
if not item['type'].startswith('child<'):
try:
- print ' %s: %s (%s)' % (item['name'], srv.command('qom-get', path=path, property=item['name']), item['type'])
+ print(' %s: %s (%s)' % (item['name'], srv.command('qom-get', path=path, property=item['name']), item['type']))
except:
- print ' %s: <EXCEPTION> (%s)' % (item['name'], item['type'])
- print ''
+ print(' %s: <EXCEPTION> (%s)' % (item['name'], item['type']))
+ print('')
for item in items:
if item['type'].startswith('child<'):
list_node((path if (path != '/') else '') + '/' + item['name'])
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index f8267586eb..306e14cf69 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -11,6 +11,7 @@
# or (at your option) any later version. See the COPYING file in
# the top-level directory.
+from __future__ import print_function
import os
import sys
sys.path.append(os.path.join(os.path.dirname(__file__),
@@ -87,7 +88,7 @@ def _get_so_libs(executable):
so_lib = search.groups()[1]
libs.append("%s/%s" % (so_path, so_lib))
except subprocess.CalledProcessError:
- print "%s had no associated libraries (static build?)" % (executable)
+ print("%s had no associated libraries (static build?)" % (executable))
return libs
@@ -161,7 +162,7 @@ class Docker(object):
continue
if only_known and instance_uuid not in self._instances:
continue
- print "Terminating", i
+ print("Terminating", i)
if active:
self._do(["kill", i])
self._do(["rm", i])
@@ -288,7 +289,7 @@ class BuildCommand(SubCommand):
if "--no-cache" not in argv and \
dkr.image_matches_dockerfile(tag, dockerfile):
if not args.quiet:
- print "Image is up to date."
+ print("Image is up to date.")
else:
# Create a docker context directory for the build
docker_dir = tempfile.mkdtemp(prefix="docker_build")
@@ -300,10 +301,10 @@ class BuildCommand(SubCommand):
rc = subprocess.call(os.path.realpath(docker_pre),
cwd=docker_dir, stdout=stdout)
if rc == 3:
- print "Skip"
+ print("Skip")
return 0
elif rc != 0:
- print "%s exited with code %d" % (docker_pre, rc)
+ print("%s exited with code %d" % (docker_pre, rc))
return 1
# Copy any extra files into the Docker context. These can be
@@ -399,11 +400,11 @@ class ProbeCommand(SubCommand):
try:
docker = Docker()
if docker._command[0] == "docker":
- print "yes"
+ print("yes")
elif docker._command[0] == "sudo":
- print "sudo"
+ print("sudo")
except Exception:
- print "no"
+ print("no")
return
diff --git a/tests/docker/travis.py b/tests/docker/travis.py
index 703a7fde85..ea1ef169e6 100755
--- a/tests/docker/travis.py
+++ b/tests/docker/travis.py
@@ -11,6 +11,7 @@
# or (at your option) any later version. See the COPYING file in
# the top-level directory.
+from __future__ import print_function
import sys
import yaml
import itertools
@@ -34,14 +35,14 @@ def main():
sys.stderr.write("Usage: %s <travis-file>\n" % sys.argv[0])
return 1
conf = load_yaml(sys.argv[1])
- print "\n".join((": ${%s}" % var for var in conf["env"]["global"]))
+ print("\n".join((": ${%s}" % var for var in conf["env"]["global"])))
for config in conf_iter(conf):
- print "("
- print "\n".join(config["env"])
- print "alias cc=" + config["compiler"]
- print "\n".join(conf["before_script"])
- print "\n".join(conf["script"])
- print ")"
+ print("(")
+ print("\n".join(config["env"]))
+ print("alias cc=" + config["compiler"])
+ print("\n".join(conf["before_script"]))
+ print("\n".join(conf["script"]))
+ print(")")
return 0
if __name__ == "__main__":
diff --git a/tests/guest-debug/test-gdbstub.py b/tests/guest-debug/test-gdbstub.py
index 31ba6c943a..474d2c5c65 100644
--- a/tests/guest-debug/test-gdbstub.py
+++ b/tests/guest-debug/test-gdbstub.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
#
# This script needs to be run on startup
# qemu -kernel ${KERNEL} -s -S
diff --git a/tests/image-fuzzer/runner.py b/tests/image-fuzzer/runner.py
index 96a1c11b2f..8de656933e 100755
--- a/tests/image-fuzzer/runner.py
+++ b/tests/image-fuzzer/runner.py
@@ -18,6 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
+from __future__ import print_function
import sys
import os
import signal
@@ -36,9 +37,8 @@ except ImportError:
try:
import simplejson as json
except ImportError:
- print >>sys.stderr, \
- "Warning: Module for JSON processing is not found.\n" \
- "'--config' and '--command' options are not supported."
+ print("Warning: Module for JSON processing is not found.\n" \
+ "'--config' and '--command' options are not supported.", file=sys.stderr)
# Backing file sizes in MB
MAX_BACKING_FILE_SIZE = 10
@@ -158,9 +158,8 @@ class TestEnv(object):
try:
os.makedirs(self.current_dir)
except OSError as e:
- print >>sys.stderr, \
- "Error: The working directory '%s' cannot be used. Reason: %s"\
- % (self.work_dir, e[1])
+ print("Error: The working directory '%s' cannot be used. Reason: %s"\
+ % (self.work_dir, e[1]), file=sys.stderr)
raise TestException
self.log = open(os.path.join(self.current_dir, "test.log"), "w")
self.parent_log = open(run_log, "a")
@@ -277,7 +276,7 @@ class TestEnv(object):
if __name__ == '__main__':
def usage():
- print """
+ print("""
Usage: runner.py [OPTION...] TEST_DIR IMG_GENERATOR
Set up test environment in TEST_DIR and run a test in it. A module for
@@ -326,7 +325,7 @@ if __name__ == '__main__':
If '--config' argument is specified, fields not listed in
the configuration array will not be fuzzed.
- """
+ """)
def run_test(test_id, seed, work_dir, run_log, cleanup, log_all,
command, fuzz_config):
@@ -357,8 +356,7 @@ if __name__ == '__main__':
['command=', 'help', 'seed=', 'config=',
'keep_passed', 'verbose', 'duration='])
except getopt.error as e:
- print >>sys.stderr, \
- "Error: %s\n\nTry 'runner.py --help' for more information" % e
+ print("Error: %s\n\nTry 'runner.py --help' for more information" % e, file=sys.stderr)
sys.exit(1)
command = None
@@ -375,9 +373,8 @@ if __name__ == '__main__':
try:
command = json.loads(arg)
except (TypeError, ValueError, NameError) as e:
- print >>sys.stderr, \
- "Error: JSON array of test commands cannot be loaded.\n" \
- "Reason: %s" % e
+ print("Error: JSON array of test commands cannot be loaded.\n" \
+ "Reason: %s" % e, file=sys.stderr)
sys.exit(1)
elif opt in ('-k', '--keep_passed'):
cleanup = False
@@ -391,15 +388,13 @@ if __name__ == '__main__':
try:
config = json.loads(arg)
except (TypeError, ValueError, NameError) as e:
- print >>sys.stderr, \
- "Error: JSON array with the fuzzer configuration cannot" \
- " be loaded\nReason: %s" % e
+ print("Error: JSON array with the fuzzer configuration cannot" \
+ " be loaded\nReason: %s" % e, file=sys.stderr)
sys.exit(1)
if not len(args) == 2:
- print >>sys.stderr, \
- "Expected two parameters\nTry 'runner.py --help'" \
- " for more information."
+ print("Expected two parameters\nTry 'runner.py --help'" \
+ " for more information.", file=sys.stderr)
sys.exit(1)
work_dir = os.path.realpath(args[0])
@@ -415,9 +410,8 @@ if __name__ == '__main__':
try:
image_generator = __import__(generator_name)
except ImportError as e:
- print >>sys.stderr, \
- "Error: The image generator '%s' cannot be imported.\n" \
- "Reason: %s" % (generator_name, e)
+ print("Error: The image generator '%s' cannot be imported.\n" \
+ "Reason: %s" % (generator_name, e), file=sys.stderr)
sys.exit(1)
# Enable core dumps
diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py
index e14d4320b2..398e3f2706 100644
--- a/tests/migration/guestperf/engine.py
+++ b/tests/migration/guestperf/engine.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
#
# Migration test main engine
#
@@ -117,7 +118,7 @@ class Engine(object):
# XXX how to get dst timings on remote host ?
if self._verbose:
- print "Sleeping %d seconds for initial guest workload run" % self._sleep
+ print("Sleeping %d seconds for initial guest workload run" % self._sleep)
sleep_secs = self._sleep
while sleep_secs > 1:
src_qemu_time.append(self._cpu_timing(src_pid))
@@ -126,7 +127,7 @@ class Engine(object):
sleep_secs -= 1
if self._verbose:
- print "Starting migration"
+ print("Starting migration")
if scenario._auto_converge:
resp = src.command("migrate-set-capabilities",
capabilities = [
@@ -216,7 +217,7 @@ class Engine(object):
if progress._status == "completed":
if self._verbose:
- print "Sleeping %d seconds for final guest workload run" % self._sleep
+ print("Sleeping %d seconds for final guest workload run" % self._sleep)
sleep_secs = self._sleep
while sleep_secs > 1:
time.sleep(1)
@@ -227,23 +228,23 @@ class Engine(object):
return [progress_history, src_qemu_time, src_vcpu_time]
if self._verbose and (loop % 20) == 0:
- print "Iter %d: remain %5dMB of %5dMB (total %5dMB @ %5dMb/sec)" % (
+ print("Iter %d: remain %5dMB of %5dMB (total %5dMB @ %5dMb/sec)" % (
progress._ram._iterations,
progress._ram._remaining_bytes / (1024 * 1024),
progress._ram._total_bytes / (1024 * 1024),
progress._ram._transferred_bytes / (1024 * 1024),
progress._ram._transfer_rate_mbs,
- )
+ ))
if progress._ram._iterations > scenario._max_iters:
if self._verbose:
- print "No completion after %d iterations over RAM" % scenario._max_iters
+ print("No completion after %d iterations over RAM" % scenario._max_iters)
src.command("migrate_cancel")
continue
if time.time() > (start + scenario._max_time):
if self._verbose:
- print "No completion after %d seconds" % scenario._max_time
+ print("No completion after %d seconds" % scenario._max_time)
src.command("migrate_cancel")
continue
@@ -251,7 +252,7 @@ class Engine(object):
progress._ram._iterations >= scenario._post_copy_iters and
not post_copy):
if self._verbose:
- print "Switching to post-copy after %d iterations" % scenario._post_copy_iters
+ print("Switching to post-copy after %d iterations" % scenario._post_copy_iters)
resp = src.command("migrate-start-postcopy")
post_copy = True
@@ -259,7 +260,7 @@ class Engine(object):
progress._ram._iterations >= scenario._pause_iters and
not paused):
if self._verbose:
- print "Pausing VM after %d iterations" % scenario._pause_iters
+ print("Pausing VM after %d iterations" % scenario._pause_iters)
resp = src.command("stop")
paused = True
@@ -348,7 +349,7 @@ class Engine(object):
if not log:
return []
if self._debug:
- print log
+ print(log)
regex = r"[^\s]+\s\((\d+)\):\sINFO:\s(\d+)ms\scopied\s\d+\sGB\sin\s(\d+)ms"
matcher = re.compile(regex)
@@ -407,7 +408,7 @@ class Engine(object):
if uri[0:5] == "unix:":
os.remove(uri[5:])
if self._verbose:
- print "Finished migration"
+ print("Finished migration")
src.shutdown()
dst.shutdown()
@@ -420,7 +421,7 @@ class Engine(object):
self._initrd, self._transport, self._sleep)
except Exception as e:
if self._debug:
- print "Failed: %s" % str(e)
+ print("Failed: %s" % str(e))
try:
src.shutdown()
except:
@@ -431,7 +432,7 @@ class Engine(object):
pass
if self._debug:
- print src.get_log()
- print dst.get_log()
+ print(src.get_log())
+ print(dst.get_log())
raise
diff --git a/tests/migration/guestperf/plot.py b/tests/migration/guestperf/plot.py
index bc42249e16..aa98912a82 100644
--- a/tests/migration/guestperf/plot.py
+++ b/tests/migration/guestperf/plot.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
#
# Migration test graph plotting
#
@@ -588,7 +589,7 @@ class Plot(object):
"""
def generate_html(self, fh):
- print >>fh, """<html>
+ print("""<html>
<head>
<script type="text/javascript" src="plotly.min.js">
</script>
@@ -601,19 +602,19 @@ class Plot(object):
<h1>Migration report</h1>
<h2>Chart summary</h2>
<div id="chart">
-""" % self._generate_style()
- print >>fh, self._generate_chart()
- print >>fh, """
+""" % self._generate_style(), file=fh)
+ print(self._generate_chart(), file=fh)
+ print("""
</div>
<h2>Report details</h2>
<div id="report">
-"""
- print >>fh, self._generate_report()
- print >>fh, """
+""", file=fh)
+ print(self._generate_report(), file=fh)
+ print("""
</div>
</body>
</html>
-"""
+""", file=fh)
def generate(self, filename):
if filename is None:
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 = []
diff --git a/tests/qemu-iotests/149 b/tests/qemu-iotests/149
index 223cd68ad5..d3ffa259db 100755
--- a/tests/qemu-iotests/149
+++ b/tests/qemu-iotests/149
@@ -20,6 +20,7 @@
# Exercise the QEMU 'luks' block driver to validate interoperability
# with the Linux dm-crypt + cryptsetup implementation
+from __future__ import print_function
import subprocess
import os
import os.path
@@ -376,7 +377,7 @@ def test_once(config, qemu_img=False):
finally:
iotests.log("# Delete image")
delete_image(config)
- print
+ print()
# Obviously we only work with the luks image format
diff --git a/tests/qemu-iotests/165 b/tests/qemu-iotests/165
index 2936929627..88f62d3c6d 100755
--- a/tests/qemu-iotests/165
+++ b/tests/qemu-iotests/165
@@ -18,6 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
+from __future__ import print_function
import os
import re
import iotests
@@ -85,7 +86,7 @@ class TestPersistentDirtyBitmap(iotests.QMPTestCase):
log = re.sub(r'^\[I \d+\.\d+\] OPENED\n', '', log)
log = re.sub(r'\[I \+\d+\.\d+\] CLOSED\n?$', '', log)
if log:
- print log
+ print(log)
self.vm = self.mkVm()
self.vm.launch()
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index fdbdd8b300..fd8f79fef9 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
# Common utilities and Python wrappers for qemu-iotests
#
# Copyright (C) 2012 IBM Corp.
@@ -239,7 +240,7 @@ def filter_img_info(output, filename):
def log(msg, filters=[]):
for flt in filters:
msg = flt(msg)
- print msg
+ print(msg)
class Timeout:
def __init__(self, seconds, errmsg = "Timeout"):
@@ -599,7 +600,7 @@ def notrun(reason):
seq = os.path.basename(sys.argv[0])
open('%s/%s.notrun' % (output_dir, seq), 'wb').write(reason + '\n')
- print '%s not run: %s' % (seq, reason)
+ print('%s not run: %s' % (seq, reason))
sys.exit(0)
def verify_image_format(supported_fmts=[], unsupported_fmts=[]):
diff --git a/tests/qemu-iotests/nbd-fault-injector.py b/tests/qemu-iotests/nbd-fault-injector.py
index 8a04d979aa..f9193c0fae 100755
--- a/tests/qemu-iotests/nbd-fault-injector.py
+++ b/tests/qemu-iotests/nbd-fault-injector.py
@@ -43,6 +43,7 @@
# This work is licensed under the terms of the GNU GPL, version 2 or later.
# See the COPYING file in the top-level directory.
+from __future__ import print_function
import sys
import socket
import struct
@@ -110,7 +111,7 @@ class FaultInjectionSocket(object):
for rule in self.rules:
if rule.match(event, io):
if rule.when == 0 or bufsize is None:
- print 'Closing connection on rule match %s' % rule.name
+ print('Closing connection on rule match %s' % rule.name)
sys.exit(0)
if rule.when != -1:
return rule.when
@@ -182,7 +183,7 @@ def handle_connection(conn, use_export):
elif req.type == NBD_CMD_DISC:
break
else:
- print 'unrecognized command type %#02x' % req.type
+ print('unrecognized command type %#02x' % req.type)
break
conn.close()
@@ -242,7 +243,7 @@ def open_socket(path):
sock = socket.socket(socket.AF_UNIX)
sock.bind(path)
sock.listen(0)
- print 'Listening on %s' % path
+ print('Listening on %s' % path)
sys.stdout.flush() # another process may be waiting, show message now
return sock
diff --git a/tests/qemu-iotests/qcow2.py b/tests/qemu-iotests/qcow2.py
index 9cc4cf7d08..b95a837759 100755
--- a/tests/qemu-iotests/qcow2.py
+++ b/tests/qemu-iotests/qcow2.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
+from __future__ import print_function
import sys
import struct
import string
@@ -129,8 +130,8 @@ class QcowHeader:
def dump(self):
for f in QcowHeader.fields:
- print "%-25s" % f[2], f[1] % self.__dict__[f[2]]
- print ""
+ print("%-25s" % f[2], f[1] % self.__dict__[f[2]])
+ print("")
def dump_extensions(self):
for ex in self.extensions:
@@ -141,11 +142,11 @@ class QcowHeader:
else:
data = "<binary>"
- print "Header extension:"
- print "%-25s %#x" % ("magic", ex.magic)
- print "%-25s %d" % ("length", ex.length)
- print "%-25s %s" % ("data", data)
- print ""
+ print("Header extension:")
+ print("%-25s %#x" % ("magic", ex.magic))
+ print("%-25s %d" % ("length", ex.length))
+ print("%-25s %s" % ("data", data))
+ print("")
def cmd_dump_header(fd):
@@ -157,12 +158,12 @@ def cmd_set_header(fd, name, value):
try:
value = int(value, 0)
except:
- print "'%s' is not a valid number" % value
+ print("'%s' is not a valid number" % value)
sys.exit(1)
fields = (field[2] for field in QcowHeader.fields)
if not name in fields:
- print "'%s' is not a known header field" % name
+ print("'%s' is not a known header field" % name)
sys.exit(1)
h = QcowHeader(fd)
@@ -173,7 +174,7 @@ def cmd_add_header_ext(fd, magic, data):
try:
magic = int(magic, 0)
except:
- print "'%s' is not a valid magic number" % magic
+ print("'%s' is not a valid magic number" % magic)
sys.exit(1)
h = QcowHeader(fd)
@@ -188,7 +189,7 @@ def cmd_del_header_ext(fd, magic):
try:
magic = int(magic, 0)
except:
- print "'%s' is not a valid magic number" % magic
+ print("'%s' is not a valid magic number" % magic)
sys.exit(1)
h = QcowHeader(fd)
@@ -200,7 +201,7 @@ def cmd_del_header_ext(fd, magic):
h.extensions.remove(ex)
if not found:
- print "No such header extension"
+ print("No such header extension")
return
h.update(fd)
@@ -211,7 +212,7 @@ def cmd_set_feature_bit(fd, group, bit):
if bit < 0 or bit >= 64:
raise ValueError
except:
- print "'%s' is not a valid bit number in range [0, 64)" % bit
+ print("'%s' is not a valid bit number in range [0, 64)" % bit)
sys.exit(1)
h = QcowHeader(fd)
@@ -222,7 +223,7 @@ def cmd_set_feature_bit(fd, group, bit):
elif group == 'autoclear':
h.autoclear_features |= 1 << bit
else:
- print "'%s' is not a valid group, try 'incompatible', 'compatible', or 'autoclear'" % group
+ print("'%s' is not a valid group, try 'incompatible', 'compatible', or 'autoclear'" % group)
sys.exit(1)
h.update(fd)
@@ -248,16 +249,16 @@ def main(filename, cmd, args):
else:
handler(fd, *args)
return
- print "Unknown command '%s'" % cmd
+ print("Unknown command '%s'" % cmd)
finally:
fd.close()
def usage():
- print "Usage: %s <file> <cmd> [<arg>, ...]" % sys.argv[0]
- print ""
- print "Supported commands:"
+ print("Usage: %s <file> <cmd> [<arg>, ...]" % sys.argv[0])
+ print("")
+ print("Supported commands:")
for name, handler, num_args, desc in cmds:
- print " %-20s - %s" % (name, desc)
+ print(" %-20s - %s" % (name, desc))
if __name__ == '__main__':
if len(sys.argv) < 3:
diff --git a/tests/qemu-iotests/qed.py b/tests/qemu-iotests/qed.py
index 748068d7fe..ea469b9c48 100755
--- a/tests/qemu-iotests/qed.py
+++ b/tests/qemu-iotests/qed.py
@@ -10,6 +10,7 @@
# This work is licensed under the terms of the GNU GPL, version 2 or later.
# See the COPYING file in the top-level directory.
+from __future__ import print_function
import sys
import struct
import random
@@ -108,12 +109,12 @@ def corrupt_table_invalidate(qed, table):
def cmd_show(qed, *args):
'''show [header|l1|l2 <offset>]- Show header or l1/l2 tables'''
if not args or args[0] == 'header':
- print qed.header
+ print(qed.header)
elif args[0] == 'l1':
- print qed.l1_table
+ print(qed.l1_table)
elif len(args) == 2 and args[0] == 'l2':
offset = int(args[1])
- print qed.read_table(offset)
+ print(qed.read_table(offset))
else:
err('unrecognized sub-command')
@@ -146,7 +147,7 @@ def cmd_invalidate(qed, table_level):
def cmd_need_check(qed, *args):
'''need-check [on|off] - Test, set, or clear the QED_F_NEED_CHECK header bit'''
if not args:
- print bool(qed.header['features'] & QED_F_NEED_CHECK)
+ print(bool(qed.header['features'] & QED_F_NEED_CHECK))
return
if args[0] == 'on':
@@ -208,11 +209,11 @@ def cmd_copy_metadata(qed, outfile):
out.close()
def usage():
- print 'Usage: %s <file> <cmd> [<arg>, ...]' % sys.argv[0]
- print
- print 'Supported commands:'
+ print('Usage: %s <file> <cmd> [<arg>, ...]' % sys.argv[0])
+ print()
+ print('Supported commands:')
for cmd in sorted(x for x in globals() if x.startswith('cmd_')):
- print globals()[cmd].__doc__
+ print(globals()[cmd].__doc__)
sys.exit(1)
def main():
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index 3a2d508c35..3643117816 100755
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -11,6 +11,7 @@
# the COPYING file in the top-level directory.
#
+from __future__ import print_function
import os
import sys
import logging
@@ -222,7 +223,7 @@ def main(vmcls):
try:
args, argv = parse_args(vmcls.name)
if not argv and not args.build_qemu and not args.build_image:
- print "Nothing to do?"
+ print("Nothing to do?")
return 1
logging.basicConfig(level=(logging.DEBUG if args.debug
else logging.WARN))
--
2.18.0.rc1.1.g3f1ff2140
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [Qemu-devel] [PULL 02/13] python: futurize -f libfuturize.fixes.fix_absolute_import
2018-06-11 17:42 [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11 Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 01/13] python: futurize -f libfuturize.fixes.fix_print_with_import Eduardo Habkost
@ 2018-06-11 17:42 ` Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 03/13] python: futurize -f libfuturize.fixes.fix_next_call Eduardo Habkost
` (13 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: Eduardo Habkost @ 2018-06-11 17:42 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Eduardo Habkost, Cleber Rosa
Make implicit relative imports explicit and add "from __future__ import
absolute_import" at the top of each relevant module.
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_absolute_import $py
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180608122952.2009-3-ehabkost@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
scripts/qmp/qemu-ga-client | 3 ++-
scripts/qmp/qmp | 3 ++-
scripts/qmp/qmp-shell | 3 ++-
scripts/qmp/qom-fuse | 3 ++-
scripts/qmp/qom-get | 3 ++-
scripts/qmp/qom-list | 3 ++-
scripts/qmp/qom-set | 3 ++-
scripts/qmp/qom-tree | 3 ++-
tests/image-fuzzer/qcow2/__init__.py | 3 ++-
tests/image-fuzzer/qcow2/layout.py | 3 ++-
10 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/scripts/qmp/qemu-ga-client b/scripts/qmp/qemu-ga-client
index 8510814683..6045fcd3f2 100755
--- a/scripts/qmp/qemu-ga-client
+++ b/scripts/qmp/qemu-ga-client
@@ -37,10 +37,11 @@
#
from __future__ import print_function
+from __future__ import absolute_import
import base64
import random
-import qmp
+from . import qmp
class QemuGuestAgent(qmp.QEMUMonitorProtocol):
diff --git a/scripts/qmp/qmp b/scripts/qmp/qmp
index 16d3bdb6fe..4d2be4e98a 100755
--- a/scripts/qmp/qmp
+++ b/scripts/qmp/qmp
@@ -11,8 +11,9 @@
# See the COPYING file in the top-level directory.
from __future__ import print_function
+from __future__ import absolute_import
import sys, os
-from qmp import QEMUMonitorProtocol
+from .qmp import QEMUMonitorProtocol
def print_response(rsp, prefix=[]):
if type(rsp) == list:
diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell
index b1cc7e2271..38c99d8f72 100755
--- a/scripts/qmp/qmp-shell
+++ b/scripts/qmp/qmp-shell
@@ -66,7 +66,8 @@
# sent to QEMU, which is useful for debugging and documentation generation.
from __future__ import print_function
-import qmp
+from __future__ import absolute_import
+from . import qmp
import json
import ast
import readline
diff --git a/scripts/qmp/qom-fuse b/scripts/qmp/qom-fuse
index 5c6754aa63..b75aa72767 100755
--- a/scripts/qmp/qom-fuse
+++ b/scripts/qmp/qom-fuse
@@ -11,11 +11,12 @@
# the COPYING file in the top-level directory.
##
+from __future__ import absolute_import
import fuse, stat
from fuse import Fuse
import os, posix
from errno import *
-from qmp import QEMUMonitorProtocol
+from .qmp import QEMUMonitorProtocol
fuse.fuse_python_api = (0, 2)
diff --git a/scripts/qmp/qom-get b/scripts/qmp/qom-get
index 291c8bfbc2..6313f27e8e 100755
--- a/scripts/qmp/qom-get
+++ b/scripts/qmp/qom-get
@@ -12,9 +12,10 @@
##
from __future__ import print_function
+from __future__ import absolute_import
import sys
import os
-from qmp import QEMUMonitorProtocol
+from .qmp import QEMUMonitorProtocol
cmd, args = sys.argv[0], sys.argv[1:]
socket_path = None
diff --git a/scripts/qmp/qom-list b/scripts/qmp/qom-list
index cd907bb81f..80b0a3d1be 100755
--- a/scripts/qmp/qom-list
+++ b/scripts/qmp/qom-list
@@ -12,9 +12,10 @@
##
from __future__ import print_function
+from __future__ import absolute_import
import sys
import os
-from qmp import QEMUMonitorProtocol
+from .qmp import QEMUMonitorProtocol
cmd, args = sys.argv[0], sys.argv[1:]
socket_path = None
diff --git a/scripts/qmp/qom-set b/scripts/qmp/qom-set
index fbe4b3e471..cbffb65880 100755
--- a/scripts/qmp/qom-set
+++ b/scripts/qmp/qom-set
@@ -12,9 +12,10 @@
##
from __future__ import print_function
+from __future__ import absolute_import
import sys
import os
-from qmp import QEMUMonitorProtocol
+from .qmp import QEMUMonitorProtocol
cmd, args = sys.argv[0], sys.argv[1:]
socket_path = None
diff --git a/scripts/qmp/qom-tree b/scripts/qmp/qom-tree
index 0ffd1ff1de..ad4be233e6 100755
--- a/scripts/qmp/qom-tree
+++ b/scripts/qmp/qom-tree
@@ -14,9 +14,10 @@
##
from __future__ import print_function
+from __future__ import absolute_import
import sys
import os
-from qmp import QEMUMonitorProtocol
+from .qmp import QEMUMonitorProtocol
cmd, args = sys.argv[0], sys.argv[1:]
socket_path = None
diff --git a/tests/image-fuzzer/qcow2/__init__.py b/tests/image-fuzzer/qcow2/__init__.py
index e2ebe19311..09ef59821b 100644
--- a/tests/image-fuzzer/qcow2/__init__.py
+++ b/tests/image-fuzzer/qcow2/__init__.py
@@ -1 +1,2 @@
-from layout import create_image
+from __future__ import absolute_import
+from .layout import create_image
diff --git a/tests/image-fuzzer/qcow2/layout.py b/tests/image-fuzzer/qcow2/layout.py
index 63e801f4e8..675877da96 100644
--- a/tests/image-fuzzer/qcow2/layout.py
+++ b/tests/image-fuzzer/qcow2/layout.py
@@ -16,9 +16,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
+from __future__ import absolute_import
import random
import struct
-import fuzz
+from . import fuzz
from math import ceil
from os import urandom
from itertools import chain
--
2.18.0.rc1.1.g3f1ff2140
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [Qemu-devel] [PULL 03/13] python: futurize -f libfuturize.fixes.fix_next_call
2018-06-11 17:42 [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11 Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 01/13] python: futurize -f libfuturize.fixes.fix_print_with_import Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 02/13] python: futurize -f libfuturize.fixes.fix_absolute_import Eduardo Habkost
@ 2018-06-11 17:42 ` Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 04/13] python: futurize -f lib2to3.fixes.fix_has_key Eduardo Habkost
` (12 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: Eduardo Habkost @ 2018-06-11 17:42 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Eduardo Habkost, Cleber Rosa
Change obj.next() calls to next(obj).
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_next_call $py
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180608122952.2009-4-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
scripts/ordereddict.py | 4 ++--
scripts/vmstate-static-checker.py | 4 ++--
tests/image-fuzzer/runner.py | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/ordereddict.py b/scripts/ordereddict.py
index 2d1d81370b..68ed340b33 100644
--- a/scripts/ordereddict.py
+++ b/scripts/ordereddict.py
@@ -71,9 +71,9 @@ class OrderedDict(dict, DictMixin):
if not self:
raise KeyError('dictionary is empty')
if last:
- key = reversed(self).next()
+ key = next(reversed(self))
else:
- key = iter(self).next()
+ key = next(iter(self))
value = self.pop(key)
return key, value
diff --git a/scripts/vmstate-static-checker.py b/scripts/vmstate-static-checker.py
index 60d1bf4cda..d3467288dc 100755
--- a/scripts/vmstate-static-checker.py
+++ b/scripts/vmstate-static-checker.py
@@ -158,7 +158,7 @@ def check_fields(src_fields, dest_fields, desc, sec):
while True:
if advance_src:
try:
- s_item = s_iter.next()
+ s_item = next(s_iter)
except StopIteration:
if s_iter_list == []:
break
@@ -173,7 +173,7 @@ def check_fields(src_fields, dest_fields, desc, sec):
if advance_dest:
try:
- d_item = d_iter.next()
+ d_item = next(d_iter)
except StopIteration:
if d_iter_list == []:
# We were not in a substruct
diff --git a/tests/image-fuzzer/runner.py b/tests/image-fuzzer/runner.py
index 8de656933e..45e8fca63f 100755
--- a/tests/image-fuzzer/runner.py
+++ b/tests/image-fuzzer/runner.py
@@ -422,7 +422,7 @@ if __name__ == '__main__':
test_id = count(1)
while should_continue(duration, start_time):
try:
- run_test(str(test_id.next()), seed, work_dir, run_log, cleanup,
+ run_test(str(next(test_id)), seed, work_dir, run_log, cleanup,
log_all, command, config)
except (KeyboardInterrupt, SystemExit):
sys.exit(1)
--
2.18.0.rc1.1.g3f1ff2140
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [Qemu-devel] [PULL 04/13] python: futurize -f lib2to3.fixes.fix_has_key
2018-06-11 17:42 [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11 Eduardo Habkost
` (2 preceding siblings ...)
2018-06-11 17:42 ` [Qemu-devel] [PULL 03/13] python: futurize -f libfuturize.fixes.fix_next_call Eduardo Habkost
@ 2018-06-11 17:42 ` Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 05/13] python: futurize -f lib2to3.fixes.fix_standarderror Eduardo Habkost
` (11 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: Eduardo Habkost @ 2018-06-11 17:42 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Eduardo Habkost, Cleber Rosa
Change "dict.has_key(key)" to "key in dict"
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 lib2to3.fixes.fix_has_key $py
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180608122952.2009-5-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
scripts/qmp/qmp | 4 ++--
scripts/qmp/qmp-shell | 2 +-
scripts/qmp/qom-fuse | 2 +-
scripts/qmp/qom-get | 2 +-
scripts/qmp/qom-list | 2 +-
scripts/qmp/qom-set | 2 +-
scripts/qmp/qom-tree | 2 +-
tests/qemu-iotests/093 | 2 +-
tests/qemu-iotests/096 | 4 ++--
tests/qemu-iotests/136 | 2 +-
10 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/scripts/qmp/qmp b/scripts/qmp/qmp
index 4d2be4e98a..33a0d6b73a 100755
--- a/scripts/qmp/qmp
+++ b/scripts/qmp/qmp
@@ -36,7 +36,7 @@ def main(args):
path = None
# Use QMP_PATH if it's set
- if os.environ.has_key('QMP_PATH'):
+ if 'QMP_PATH' in os.environ:
path = os.environ['QMP_PATH']
while len(args):
@@ -80,7 +80,7 @@ def main(args):
def do_command(srv, cmd, **kwds):
rsp = srv.cmd(cmd, kwds)
- if rsp.has_key('error'):
+ if 'error' in rsp:
raise Exception(rsp['error']['desc'])
return rsp['return']
diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell
index 38c99d8f72..26418dab95 100755
--- a/scripts/qmp/qmp-shell
+++ b/scripts/qmp/qmp-shell
@@ -134,7 +134,7 @@ class QMPShell(qmp.QEMUMonitorProtocol):
def _fill_completion(self):
cmds = self.cmd('query-commands')
- if cmds.has_key('error'):
+ if 'error' in cmds:
return
for cmd in cmds['return']:
self._completer.append(cmd['name'])
diff --git a/scripts/qmp/qom-fuse b/scripts/qmp/qom-fuse
index b75aa72767..b00cb0a0af 100755
--- a/scripts/qmp/qom-fuse
+++ b/scripts/qmp/qom-fuse
@@ -29,7 +29,7 @@ class QOMFS(Fuse):
self.ino_count = 1
def get_ino(self, path):
- if self.ino_map.has_key(path):
+ if path in self.ino_map:
return self.ino_map[path]
self.ino_map[path] = self.ino_count
self.ino_count += 1
diff --git a/scripts/qmp/qom-get b/scripts/qmp/qom-get
index 6313f27e8e..a3f5d7660e 100755
--- a/scripts/qmp/qom-get
+++ b/scripts/qmp/qom-get
@@ -45,7 +45,7 @@ if len(args) > 0:
args = args[2:]
if not socket_path:
- if os.environ.has_key('QMP_SOCKET'):
+ if 'QMP_SOCKET' in os.environ:
socket_path = os.environ['QMP_SOCKET']
else:
usage_error("no QMP socket path or address given");
diff --git a/scripts/qmp/qom-list b/scripts/qmp/qom-list
index 80b0a3d1be..2ba25e1792 100755
--- a/scripts/qmp/qom-list
+++ b/scripts/qmp/qom-list
@@ -45,7 +45,7 @@ if len(args) > 0:
args = args[2:]
if not socket_path:
- if os.environ.has_key('QMP_SOCKET'):
+ if 'QMP_SOCKET' in os.environ:
socket_path = os.environ['QMP_SOCKET']
else:
usage_error("no QMP socket path or address given");
diff --git a/scripts/qmp/qom-set b/scripts/qmp/qom-set
index cbffb65880..0352668812 100755
--- a/scripts/qmp/qom-set
+++ b/scripts/qmp/qom-set
@@ -46,7 +46,7 @@ if len(args) > 0:
args = args[2:]
if not socket_path:
- if os.environ.has_key('QMP_SOCKET'):
+ if 'QMP_SOCKET' in os.environ:
socket_path = os.environ['QMP_SOCKET']
else:
usage_error("no QMP socket path or address given");
diff --git a/scripts/qmp/qom-tree b/scripts/qmp/qom-tree
index ad4be233e6..32e708a13e 100755
--- a/scripts/qmp/qom-tree
+++ b/scripts/qmp/qom-tree
@@ -47,7 +47,7 @@ if len(args) > 0:
args = args[2:]
if not socket_path:
- if os.environ.has_key('QMP_SOCKET'):
+ if 'QMP_SOCKET' in os.environ:
socket_path = os.environ['QMP_SOCKET']
else:
usage_error("no QMP socket path or address given");
diff --git a/tests/qemu-iotests/093 b/tests/qemu-iotests/093
index c3404a3171..68e344f8c1 100755
--- a/tests/qemu-iotests/093
+++ b/tests/qemu-iotests/093
@@ -237,7 +237,7 @@ class ThrottleTestGroupNames(iotests.QMPTestCase):
if name:
self.assertEqual(info["group"], name)
else:
- self.assertFalse(info.has_key('group'))
+ self.assertFalse('group' in info)
return
raise Exception("No group information found for '%s'" % device)
diff --git a/tests/qemu-iotests/096 b/tests/qemu-iotests/096
index aeeb3753cf..a69439602d 100755
--- a/tests/qemu-iotests/096
+++ b/tests/qemu-iotests/096
@@ -53,9 +53,9 @@ class TestLiveSnapshot(iotests.QMPTestCase):
self.assertEqual(r['iops'], self.iops)
self.assertEqual(r['iops_size'], self.iops_size)
else:
- self.assertFalse(r.has_key('group'))
+ self.assertFalse('group' in r)
self.assertEqual(r['iops'], 0)
- self.assertFalse(r.has_key('iops_size'))
+ self.assertFalse('iops_size' in r)
def testSnapshot(self):
self.checkConfig('base')
diff --git a/tests/qemu-iotests/136 b/tests/qemu-iotests/136
index 88b97ea7c6..a154d8ef9d 100755
--- a/tests/qemu-iotests/136
+++ b/tests/qemu-iotests/136
@@ -203,7 +203,7 @@ sector = "%d"
if (self.accounted_ops(read = True, write = True, flush = True) != 0):
self.assertLess(0, stats['idle_time_ns'])
else:
- self.assertFalse(stats.has_key('idle_time_ns'))
+ self.assertFalse('idle_time_ns' in stats)
# This test does not alter these, so they must be all 0
self.assertEqual(0, stats['rd_merged'])
--
2.18.0.rc1.1.g3f1ff2140
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [Qemu-devel] [PULL 05/13] python: futurize -f lib2to3.fixes.fix_standarderror
2018-06-11 17:42 [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11 Eduardo Habkost
` (3 preceding siblings ...)
2018-06-11 17:42 ` [Qemu-devel] [PULL 04/13] python: futurize -f lib2to3.fixes.fix_has_key Eduardo Habkost
@ 2018-06-11 17:42 ` Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 06/13] python: futurize -f lib2to3.fixes.fix_reduce Eduardo Habkost
` (10 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: Eduardo Habkost @ 2018-06-11 17:42 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Eduardo Habkost, Cleber Rosa
Rename StandardError to Exception.
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 lib2to3.fixes.fix_standarderror $py
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180608122952.2009-6-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
scripts/qmp/qemu-ga-client | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/qmp/qemu-ga-client b/scripts/qmp/qemu-ga-client
index 6045fcd3f2..976e69e05f 100755
--- a/scripts/qmp/qemu-ga-client
+++ b/scripts/qmp/qemu-ga-client
@@ -137,7 +137,7 @@ class QemuGuestAgentClient:
def fsfreeze(self, cmd):
if cmd not in ['status', 'freeze', 'thaw']:
- raise StandardError('Invalid command: ' + cmd)
+ raise Exception('Invalid command: ' + cmd)
return getattr(self.qga, 'fsfreeze' + '_' + cmd)()
@@ -146,7 +146,7 @@ class QemuGuestAgentClient:
def suspend(self, mode):
if mode not in ['disk', 'ram', 'hybrid']:
- raise StandardError('Invalid mode: ' + mode)
+ raise Exception('Invalid mode: ' + mode)
try:
getattr(self.qga, 'suspend' + '_' + mode)()
@@ -157,7 +157,7 @@ class QemuGuestAgentClient:
def shutdown(self, mode='powerdown'):
if mode not in ['powerdown', 'halt', 'reboot']:
- raise StandardError('Invalid mode: ' + mode)
+ raise Exception('Invalid mode: ' + mode)
try:
self.qga.shutdown(mode=mode)
--
2.18.0.rc1.1.g3f1ff2140
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [Qemu-devel] [PULL 06/13] python: futurize -f lib2to3.fixes.fix_reduce
2018-06-11 17:42 [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11 Eduardo Habkost
` (4 preceding siblings ...)
2018-06-11 17:42 ` [Qemu-devel] [PULL 05/13] python: futurize -f lib2to3.fixes.fix_standarderror Eduardo Habkost
@ 2018-06-11 17:42 ` Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 07/13] python: futurize -f lib2to3.fixes.fix_tuple_params Eduardo Habkost
` (9 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: Eduardo Habkost @ 2018-06-11 17:42 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Eduardo Habkost, Cleber Rosa
Handle the move of reduce() to functools.reduce().
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 lib2to3.fixes.fix_reduce $py
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180608122952.2009-7-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
tests/image-fuzzer/qcow2/fuzz.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/image-fuzzer/qcow2/fuzz.py b/tests/image-fuzzer/qcow2/fuzz.py
index 20eba6bc1b..abc4f0635d 100644
--- a/tests/image-fuzzer/qcow2/fuzz.py
+++ b/tests/image-fuzzer/qcow2/fuzz.py
@@ -17,6 +17,7 @@
#
import random
+from functools import reduce
UINT8 = 0xff
UINT16 = 0xffff
--
2.18.0.rc1.1.g3f1ff2140
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [Qemu-devel] [PULL 07/13] python: futurize -f lib2to3.fixes.fix_tuple_params
2018-06-11 17:42 [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11 Eduardo Habkost
` (5 preceding siblings ...)
2018-06-11 17:42 ` [Qemu-devel] [PULL 06/13] python: futurize -f lib2to3.fixes.fix_reduce Eduardo Habkost
@ 2018-06-11 17:42 ` Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 08/13] python: futurize -f lib2to3.fixes.fix_renames Eduardo Habkost
` (8 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: Eduardo Habkost @ 2018-06-11 17:42 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Eduardo Habkost, Cleber Rosa
Remove implicit tuple parameter unpacking.
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 lib2to3.fixes.fix_tuple_params $py
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180608122952.2009-8-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
scripts/analyse-locks-simpletrace.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/analyse-locks-simpletrace.py b/scripts/analyse-locks-simpletrace.py
index 352bc9c22d..30090bdfff 100755
--- a/scripts/analyse-locks-simpletrace.py
+++ b/scripts/analyse-locks-simpletrace.py
@@ -78,7 +78,7 @@ if __name__ == '__main__':
# Now dump the individual lock stats
for key, val in sorted(analyser.mutex_records.iteritems(),
- key=lambda (k,v): v["locks"]):
+ key=lambda k_v: k_v[1]["locks"]):
print ("Lock: %#x locks: %d, locked: %d, unlocked: %d" %
(key, val["locks"], val["locked"], val["unlocked"]))
--
2.18.0.rc1.1.g3f1ff2140
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [Qemu-devel] [PULL 08/13] python: futurize -f lib2to3.fixes.fix_renames
2018-06-11 17:42 [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11 Eduardo Habkost
` (6 preceding siblings ...)
2018-06-11 17:42 ` [Qemu-devel] [PULL 07/13] python: futurize -f lib2to3.fixes.fix_tuple_params Eduardo Habkost
@ 2018-06-11 17:42 ` Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 09/13] python: futurize -f lib2to3.fixes.fix_except Eduardo Habkost
` (7 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: Eduardo Habkost @ 2018-06-11 17:42 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Eduardo Habkost, Cleber Rosa
Change sys.maxint to sys.maxsize.
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 lib2to3.fixes.fix_renames $py
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180608122952.2009-9-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
tests/image-fuzzer/runner.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/image-fuzzer/runner.py b/tests/image-fuzzer/runner.py
index 45e8fca63f..95d84f38f3 100755
--- a/tests/image-fuzzer/runner.py
+++ b/tests/image-fuzzer/runner.py
@@ -128,7 +128,7 @@ class TestEnv(object):
if seed is not None:
self.seed = seed
else:
- self.seed = str(random.randint(0, sys.maxint))
+ self.seed = str(random.randint(0, sys.maxsize))
random.seed(self.seed)
self.init_path = os.getcwd()
--
2.18.0.rc1.1.g3f1ff2140
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [Qemu-devel] [PULL 09/13] python: futurize -f lib2to3.fixes.fix_except
2018-06-11 17:42 [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11 Eduardo Habkost
` (7 preceding siblings ...)
2018-06-11 17:42 ` [Qemu-devel] [PULL 08/13] python: futurize -f lib2to3.fixes.fix_renames Eduardo Habkost
@ 2018-06-11 17:42 ` Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 10/13] python: futurize -f lib2to3.fixes.fix_numliterals Eduardo Habkost
` (6 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: Eduardo Habkost @ 2018-06-11 17:42 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Eduardo Habkost, Cleber Rosa
Convert "except X, T" to "except X as T".
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 lib2to3.fixes.fix_except $py
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180608122952.2009-10-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
scripts/simpletrace.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/simpletrace.py b/scripts/simpletrace.py
index 2658b5cc7c..d4a50a1e2b 100755
--- a/scripts/simpletrace.py
+++ b/scripts/simpletrace.py
@@ -45,7 +45,7 @@ def get_record(edict, idtoname, rechdr, fobj):
rec = (name, rechdr[1], rechdr[3])
try:
event = edict[name]
- except KeyError, e:
+ except KeyError as e:
import sys
sys.stderr.write('%s event is logged but is not declared ' \
'in the trace events file, try using ' \
--
2.18.0.rc1.1.g3f1ff2140
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [Qemu-devel] [PULL 10/13] python: futurize -f lib2to3.fixes.fix_numliterals
2018-06-11 17:42 [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11 Eduardo Habkost
` (8 preceding siblings ...)
2018-06-11 17:42 ` [Qemu-devel] [PULL 09/13] python: futurize -f lib2to3.fixes.fix_except Eduardo Habkost
@ 2018-06-11 17:42 ` Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 11/13] configure: Require Python 2.7 or newer Eduardo Habkost
` (5 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: Eduardo Habkost @ 2018-06-11 17:42 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Eduardo Habkost, Cleber Rosa
Convert octal literals into the new syntax.
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 lib2to3.fixes.fix_numliterals $py
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180608122952.2009-11-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
scripts/qmp/qom-fuse | 6 +++---
tests/qemu-iotests/118 | 24 ++++++++++++------------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/scripts/qmp/qom-fuse b/scripts/qmp/qom-fuse
index b00cb0a0af..e524e798fc 100755
--- a/scripts/qmp/qom-fuse
+++ b/scripts/qmp/qom-fuse
@@ -90,7 +90,7 @@ class QOMFS(Fuse):
def getattr(self, path):
if self.is_link(path):
- value = posix.stat_result((0755 | stat.S_IFLNK,
+ value = posix.stat_result((0o755 | stat.S_IFLNK,
self.get_ino(path),
0,
2,
@@ -101,7 +101,7 @@ class QOMFS(Fuse):
0,
0))
elif self.is_object(path):
- value = posix.stat_result((0755 | stat.S_IFDIR,
+ value = posix.stat_result((0o755 | stat.S_IFDIR,
self.get_ino(path),
0,
2,
@@ -112,7 +112,7 @@ class QOMFS(Fuse):
0,
0))
elif self.is_property(path):
- value = posix.stat_result((0644 | stat.S_IFREG,
+ value = posix.stat_result((0o644 | stat.S_IFREG,
self.get_ino(path),
0,
1,
diff --git a/tests/qemu-iotests/118 b/tests/qemu-iotests/118
index a0469b570e..ff3b2ae3e7 100755
--- a/tests/qemu-iotests/118
+++ b/tests/qemu-iotests/118
@@ -390,14 +390,14 @@ class TestChangeReadOnly(ChangeBaseClass):
def tearDown(self):
self.vm.shutdown()
- os.chmod(old_img, 0666)
- os.chmod(new_img, 0666)
+ os.chmod(old_img, 0o666)
+ os.chmod(new_img, 0o666)
os.remove(old_img)
os.remove(new_img)
def test_ro_ro_retain(self):
- os.chmod(old_img, 0444)
- os.chmod(new_img, 0444)
+ os.chmod(old_img, 0o444)
+ os.chmod(new_img, 0o444)
self.vm.add_drive(old_img, 'media=disk,read-only=on', 'none')
self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name)
self.vm.launch()
@@ -417,7 +417,7 @@ class TestChangeReadOnly(ChangeBaseClass):
self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img)
def test_ro_rw_retain(self):
- os.chmod(old_img, 0444)
+ os.chmod(old_img, 0o444)
self.vm.add_drive(old_img, 'media=disk,read-only=on', 'none')
self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name)
self.vm.launch()
@@ -437,7 +437,7 @@ class TestChangeReadOnly(ChangeBaseClass):
self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img)
def test_rw_ro_retain(self):
- os.chmod(new_img, 0444)
+ os.chmod(new_img, 0o444)
self.vm.add_drive(old_img, 'media=disk', 'none')
self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name)
self.vm.launch()
@@ -459,7 +459,7 @@ class TestChangeReadOnly(ChangeBaseClass):
self.assert_qmp(result, 'return[0]/inserted/image/filename', old_img)
def test_ro_rw(self):
- os.chmod(old_img, 0444)
+ os.chmod(old_img, 0o444)
self.vm.add_drive(old_img, 'media=disk,read-only=on', 'none')
self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name)
self.vm.launch()
@@ -480,7 +480,7 @@ class TestChangeReadOnly(ChangeBaseClass):
self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img)
def test_rw_ro(self):
- os.chmod(new_img, 0444)
+ os.chmod(new_img, 0o444)
self.vm.add_drive(old_img, 'media=disk', 'none')
self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name)
self.vm.launch()
@@ -521,7 +521,7 @@ class TestChangeReadOnly(ChangeBaseClass):
self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img)
def test_make_ro_rw(self):
- os.chmod(new_img, 0444)
+ os.chmod(new_img, 0o444)
self.vm.add_drive(old_img, 'media=disk', 'none')
self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name)
self.vm.launch()
@@ -542,7 +542,7 @@ class TestChangeReadOnly(ChangeBaseClass):
self.assert_qmp(result, 'return[0]/inserted/image/filename', old_img)
def test_make_rw_ro_by_retain(self):
- os.chmod(old_img, 0444)
+ os.chmod(old_img, 0o444)
self.vm.add_drive(old_img, 'media=disk,read-only=on', 'none')
self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name)
self.vm.launch()
@@ -562,7 +562,7 @@ class TestChangeReadOnly(ChangeBaseClass):
self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img)
def test_make_ro_rw_by_retain(self):
- os.chmod(new_img, 0444)
+ os.chmod(new_img, 0o444)
self.vm.add_drive(old_img, 'media=disk', 'none')
self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name)
self.vm.launch()
@@ -582,7 +582,7 @@ class TestChangeReadOnly(ChangeBaseClass):
self.assert_qmp(result, 'return[0]/inserted/image/filename', old_img)
def test_rw_ro_cycle(self):
- os.chmod(new_img, 0444)
+ os.chmod(new_img, 0o444)
self.vm.add_drive(old_img, 'media=disk', 'none')
self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name)
self.vm.launch()
--
2.18.0.rc1.1.g3f1ff2140
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [Qemu-devel] [PULL 11/13] configure: Require Python 2.7 or newer
2018-06-11 17:42 [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11 Eduardo Habkost
` (9 preceding siblings ...)
2018-06-11 17:42 ` [Qemu-devel] [PULL 10/13] python: futurize -f lib2to3.fixes.fix_numliterals Eduardo Habkost
@ 2018-06-11 17:42 ` Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 12/13] python: Remove scripts/argparse.py Eduardo Habkost
` (4 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: Eduardo Habkost @ 2018-06-11 17:42 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Eduardo Habkost, Cleber Rosa
All of the supported build platforms documented in qemu-doc.texi
should already support Python 2.7.
Removing support for Python 2.6 will allow us to remove some
compatibility modules we carry in the QEMU tree:
* scripts/argparse.py
* scripts/ordereddict.py
Python 2.6 is also not receiving bug fixes upstream and is not
supported by pylint, which makes it harder to keep the code
compatible with both Python 2 and Python 3.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180608143026.20167-1-ehabkost@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Cleber Rosa <crosa@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
configure | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 14b11130a7..a8c4094c87 100755
--- a/configure
+++ b/configure
@@ -1651,8 +1651,8 @@ fi
# Note that if the Python conditional here evaluates True we will exit
# with status 1 which is a shell 'false' value.
-if ! $python -c 'import sys; sys.exit(sys.version_info < (2,6))'; then
- error_exit "Cannot use '$python', Python 2 >= 2.6 or Python 3 is required." \
+if ! $python -c 'import sys; sys.exit(sys.version_info < (2,7))'; then
+ error_exit "Cannot use '$python', Python 2 >= 2.7 or Python 3 is required." \
"Use --python=/path/to/python to specify a supported Python."
fi
--
2.18.0.rc1.1.g3f1ff2140
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [Qemu-devel] [PULL 12/13] python: Remove scripts/argparse.py
2018-06-11 17:42 [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11 Eduardo Habkost
` (10 preceding siblings ...)
2018-06-11 17:42 ` [Qemu-devel] [PULL 11/13] configure: Require Python 2.7 or newer Eduardo Habkost
@ 2018-06-11 17:42 ` Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 13/13] python: Remove scripts/ordereddict.py Eduardo Habkost
` (3 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: Eduardo Habkost @ 2018-06-11 17:42 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Eduardo Habkost, Cleber Rosa
Python 2.7 (the minimum Python version we require) already
provides the argparse module on the standard library.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180608175252.25110-2-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
scripts/argparse.py | 2406 -------------------------------------------
1 file changed, 2406 deletions(-)
delete mode 100644 scripts/argparse.py
diff --git a/scripts/argparse.py b/scripts/argparse.py
deleted file mode 100644
index 27d1f28935..0000000000
--- a/scripts/argparse.py
+++ /dev/null
@@ -1,2406 +0,0 @@
-# This is a local copy of the standard library argparse module taken from PyPI.
-# It is licensed under the Python Software Foundation License. This is a
-# fallback for Python 2.6 which does not include this module. Python 2.7+ and
-# 3+ will never load this module because built-in modules are loaded before
-# anything in sys.path.
-#
-# If your script is not located in the same directory as this file, import it
-# like this:
-#
-# import os
-# import sys
-# sys.path.append(os.path.join(os.path.dirname(__file__), ..., 'scripts'))
-# import argparse
-
-# Author: Steven J. Bethard <steven.bethard@gmail.com>.
-# Maintainer: Thomas Waldmann <tw@waldmann-edv.de>
-
-"""Command-line parsing library
-
-This module is an optparse-inspired command-line parsing library that:
-
- - handles both optional and positional arguments
- - produces highly informative usage messages
- - supports parsers that dispatch to sub-parsers
-
-The following is a simple usage example that sums integers from the
-command-line and writes the result to a file::
-
- parser = argparse.ArgumentParser(
- description='sum the integers at the command line')
- parser.add_argument(
- 'integers', metavar='int', nargs='+', type=int,
- help='an integer to be summed')
- parser.add_argument(
- '--log', default=sys.stdout, type=argparse.FileType('w'),
- help='the file where the sum should be written')
- args = parser.parse_args()
- args.log.write('%s' % sum(args.integers))
- args.log.close()
-
-The module contains the following public classes:
-
- - ArgumentParser -- The main entry point for command-line parsing. As the
- example above shows, the add_argument() method is used to populate
- the parser with actions for optional and positional arguments. Then
- the parse_args() method is invoked to convert the args at the
- command-line into an object with attributes.
-
- - ArgumentError -- The exception raised by ArgumentParser objects when
- there are errors with the parser's actions. Errors raised while
- parsing the command-line are caught by ArgumentParser and emitted
- as command-line messages.
-
- - FileType -- A factory for defining types of files to be created. As the
- example above shows, instances of FileType are typically passed as
- the type= argument of add_argument() calls.
-
- - Action -- The base class for parser actions. Typically actions are
- selected by passing strings like 'store_true' or 'append_const' to
- the action= argument of add_argument(). However, for greater
- customization of ArgumentParser actions, subclasses of Action may
- be defined and passed as the action= argument.
-
- - HelpFormatter, RawDescriptionHelpFormatter, RawTextHelpFormatter,
- ArgumentDefaultsHelpFormatter -- Formatter classes which
- may be passed as the formatter_class= argument to the
- ArgumentParser constructor. HelpFormatter is the default,
- RawDescriptionHelpFormatter and RawTextHelpFormatter tell the parser
- not to change the formatting for help text, and
- ArgumentDefaultsHelpFormatter adds information about argument defaults
- to the help.
-
-All other classes in this module are considered implementation details.
-(Also note that HelpFormatter and RawDescriptionHelpFormatter are only
-considered public as object names -- the API of the formatter objects is
-still considered an implementation detail.)
-"""
-
-__version__ = '1.4.0' # we use our own version number independent of the
- # one in stdlib and we release this on pypi.
-
-__external_lib__ = True # to make sure the tests really test THIS lib,
- # not the builtin one in Python stdlib
-
-__all__ = [
- 'ArgumentParser',
- 'ArgumentError',
- 'ArgumentTypeError',
- 'FileType',
- 'HelpFormatter',
- 'ArgumentDefaultsHelpFormatter',
- 'RawDescriptionHelpFormatter',
- 'RawTextHelpFormatter',
- 'Namespace',
- 'Action',
- 'ONE_OR_MORE',
- 'OPTIONAL',
- 'PARSER',
- 'REMAINDER',
- 'SUPPRESS',
- 'ZERO_OR_MORE',
-]
-
-
-import copy as _copy
-import os as _os
-import re as _re
-import sys as _sys
-import textwrap as _textwrap
-
-from gettext import gettext as _
-
-try:
- set
-except NameError:
- # for python < 2.4 compatibility (sets module is there since 2.3):
- from sets import Set as set
-
-try:
- basestring
-except NameError:
- basestring = str
-
-try:
- sorted
-except NameError:
- # for python < 2.4 compatibility:
- def sorted(iterable, reverse=False):
- result = list(iterable)
- result.sort()
- if reverse:
- result.reverse()
- return result
-
-
-def _callable(obj):
- return hasattr(obj, '__call__') or hasattr(obj, '__bases__')
-
-
-SUPPRESS = '==SUPPRESS=='
-
-OPTIONAL = '?'
-ZERO_OR_MORE = '*'
-ONE_OR_MORE = '+'
-PARSER = 'A...'
-REMAINDER = '...'
-_UNRECOGNIZED_ARGS_ATTR = '_unrecognized_args'
-
-# =============================
-# Utility functions and classes
-# =============================
-
-class _AttributeHolder(object):
- """Abstract base class that provides __repr__.
-
- The __repr__ method returns a string in the format::
- ClassName(attr=name, attr=name, ...)
- The attributes are determined either by a class-level attribute,
- '_kwarg_names', or by inspecting the instance __dict__.
- """
-
- def __repr__(self):
- type_name = type(self).__name__
- arg_strings = []
- for arg in self._get_args():
- arg_strings.append(repr(arg))
- for name, value in self._get_kwargs():
- arg_strings.append('%s=%r' % (name, value))
- return '%s(%s)' % (type_name, ', '.join(arg_strings))
-
- def _get_kwargs(self):
- return sorted(self.__dict__.items())
-
- def _get_args(self):
- return []
-
-
-def _ensure_value(namespace, name, value):
- if getattr(namespace, name, None) is None:
- setattr(namespace, name, value)
- return getattr(namespace, name)
-
-
-# ===============
-# Formatting Help
-# ===============
-
-class HelpFormatter(object):
- """Formatter for generating usage messages and argument help strings.
-
- Only the name of this class is considered a public API. All the methods
- provided by the class are considered an implementation detail.
- """
-
- def __init__(self,
- prog,
- indent_increment=2,
- max_help_position=24,
- width=None):
-
- # default setting for width
- if width is None:
- try:
- width = int(_os.environ['COLUMNS'])
- except (KeyError, ValueError):
- width = 80
- width -= 2
-
- self._prog = prog
- self._indent_increment = indent_increment
- self._max_help_position = max_help_position
- self._width = width
-
- self._current_indent = 0
- self._level = 0
- self._action_max_length = 0
-
- self._root_section = self._Section(self, None)
- self._current_section = self._root_section
-
- self._whitespace_matcher = _re.compile(r'\s+')
- self._long_break_matcher = _re.compile(r'\n\n\n+')
-
- # ===============================
- # Section and indentation methods
- # ===============================
- def _indent(self):
- self._current_indent += self._indent_increment
- self._level += 1
-
- def _dedent(self):
- self._current_indent -= self._indent_increment
- assert self._current_indent >= 0, 'Indent decreased below 0.'
- self._level -= 1
-
- class _Section(object):
-
- def __init__(self, formatter, parent, heading=None):
- self.formatter = formatter
- self.parent = parent
- self.heading = heading
- self.items = []
-
- def format_help(self):
- # format the indented section
- if self.parent is not None:
- self.formatter._indent()
- join = self.formatter._join_parts
- for func, args in self.items:
- func(*args)
- item_help = join([func(*args) for func, args in self.items])
- if self.parent is not None:
- self.formatter._dedent()
-
- # return nothing if the section was empty
- if not item_help:
- return ''
-
- # add the heading if the section was non-empty
- if self.heading is not SUPPRESS and self.heading is not None:
- current_indent = self.formatter._current_indent
- heading = '%*s%s:\n' % (current_indent, '', self.heading)
- else:
- heading = ''
-
- # join the section-initial newline, the heading and the help
- return join(['\n', heading, item_help, '\n'])
-
- def _add_item(self, func, args):
- self._current_section.items.append((func, args))
-
- # ========================
- # Message building methods
- # ========================
- def start_section(self, heading):
- self._indent()
- section = self._Section(self, self._current_section, heading)
- self._add_item(section.format_help, [])
- self._current_section = section
-
- def end_section(self):
- self._current_section = self._current_section.parent
- self._dedent()
-
- def add_text(self, text):
- if text is not SUPPRESS and text is not None:
- self._add_item(self._format_text, [text])
-
- def add_usage(self, usage, actions, groups, prefix=None):
- if usage is not SUPPRESS:
- args = usage, actions, groups, prefix
- self._add_item(self._format_usage, args)
-
- def add_argument(self, action):
- if action.help is not SUPPRESS:
-
- # find all invocations
- get_invocation = self._format_action_invocation
- invocations = [get_invocation(action)]
- for subaction in self._iter_indented_subactions(action):
- invocations.append(get_invocation(subaction))
-
- # update the maximum item length
- invocation_length = max([len(s) for s in invocations])
- action_length = invocation_length + self._current_indent
- self._action_max_length = max(self._action_max_length,
- action_length)
-
- # add the item to the list
- self._add_item(self._format_action, [action])
-
- def add_arguments(self, actions):
- for action in actions:
- self.add_argument(action)
-
- # =======================
- # Help-formatting methods
- # =======================
- def format_help(self):
- help = self._root_section.format_help()
- if help:
- help = self._long_break_matcher.sub('\n\n', help)
- help = help.strip('\n') + '\n'
- return help
-
- def _join_parts(self, part_strings):
- return ''.join([part
- for part in part_strings
- if part and part is not SUPPRESS])
-
- def _format_usage(self, usage, actions, groups, prefix):
- if prefix is None:
- prefix = _('usage: ')
-
- # if usage is specified, use that
- if usage is not None:
- usage = usage % dict(prog=self._prog)
-
- # if no optionals or positionals are available, usage is just prog
- elif usage is None and not actions:
- usage = '%(prog)s' % dict(prog=self._prog)
-
- # if optionals and positionals are available, calculate usage
- elif usage is None:
- prog = '%(prog)s' % dict(prog=self._prog)
-
- # split optionals from positionals
- optionals = []
- positionals = []
- for action in actions:
- if action.option_strings:
- optionals.append(action)
- else:
- positionals.append(action)
-
- # build full usage string
- format = self._format_actions_usage
- action_usage = format(optionals + positionals, groups)
- usage = ' '.join([s for s in [prog, action_usage] if s])
-
- # wrap the usage parts if it's too long
- text_width = self._width - self._current_indent
- if len(prefix) + len(usage) > text_width:
-
- # break usage into wrappable parts
- part_regexp = r'\(.*?\)+|\[.*?\]+|\S+'
- opt_usage = format(optionals, groups)
- pos_usage = format(positionals, groups)
- opt_parts = _re.findall(part_regexp, opt_usage)
- pos_parts = _re.findall(part_regexp, pos_usage)
- assert ' '.join(opt_parts) == opt_usage
- assert ' '.join(pos_parts) == pos_usage
-
- # helper for wrapping lines
- def get_lines(parts, indent, prefix=None):
- lines = []
- line = []
- if prefix is not None:
- line_len = len(prefix) - 1
- else:
- line_len = len(indent) - 1
- for part in parts:
- if line_len + 1 + len(part) > text_width:
- lines.append(indent + ' '.join(line))
- line = []
- line_len = len(indent) - 1
- line.append(part)
- line_len += len(part) + 1
- if line:
- lines.append(indent + ' '.join(line))
- if prefix is not None:
- lines[0] = lines[0][len(indent):]
- return lines
-
- # if prog is short, follow it with optionals or positionals
- if len(prefix) + len(prog) <= 0.75 * text_width:
- indent = ' ' * (len(prefix) + len(prog) + 1)
- if opt_parts:
- lines = get_lines([prog] + opt_parts, indent, prefix)
- lines.extend(get_lines(pos_parts, indent))
- elif pos_parts:
- lines = get_lines([prog] + pos_parts, indent, prefix)
- else:
- lines = [prog]
-
- # if prog is long, put it on its own line
- else:
- indent = ' ' * len(prefix)
- parts = opt_parts + pos_parts
- lines = get_lines(parts, indent)
- if len(lines) > 1:
- lines = []
- lines.extend(get_lines(opt_parts, indent))
- lines.extend(get_lines(pos_parts, indent))
- lines = [prog] + lines
-
- # join lines into usage
- usage = '\n'.join(lines)
-
- # prefix with 'usage:'
- return '%s%s\n\n' % (prefix, usage)
-
- def _format_actions_usage(self, actions, groups):
- # find group indices and identify actions in groups
- group_actions = set()
- inserts = {}
- for group in groups:
- try:
- start = actions.index(group._group_actions[0])
- except ValueError:
- continue
- else:
- end = start + len(group._group_actions)
- if actions[start:end] == group._group_actions:
- for action in group._group_actions:
- group_actions.add(action)
- if not group.required:
- if start in inserts:
- inserts[start] += ' ['
- else:
- inserts[start] = '['
- inserts[end] = ']'
- else:
- if start in inserts:
- inserts[start] += ' ('
- else:
- inserts[start] = '('
- inserts[end] = ')'
- for i in range(start + 1, end):
- inserts[i] = '|'
-
- # collect all actions format strings
- parts = []
- for i, action in enumerate(actions):
-
- # suppressed arguments are marked with None
- # remove | separators for suppressed arguments
- if action.help is SUPPRESS:
- parts.append(None)
- if inserts.get(i) == '|':
- inserts.pop(i)
- elif inserts.get(i + 1) == '|':
- inserts.pop(i + 1)
-
- # produce all arg strings
- elif not action.option_strings:
- part = self._format_args(action, action.dest)
-
- # if it's in a group, strip the outer []
- if action in group_actions:
- if part[0] == '[' and part[-1] == ']':
- part = part[1:-1]
-
- # add the action string to the list
- parts.append(part)
-
- # produce the first way to invoke the option in brackets
- else:
- option_string = action.option_strings[0]
-
- # if the Optional doesn't take a value, format is:
- # -s or --long
- if action.nargs == 0:
- part = '%s' % option_string
-
- # if the Optional takes a value, format is:
- # -s ARGS or --long ARGS
- else:
- default = action.dest.upper()
- args_string = self._format_args(action, default)
- part = '%s %s' % (option_string, args_string)
-
- # make it look optional if it's not required or in a group
- if not action.required and action not in group_actions:
- part = '[%s]' % part
-
- # add the action string to the list
- parts.append(part)
-
- # insert things at the necessary indices
- for i in sorted(inserts, reverse=True):
- parts[i:i] = [inserts[i]]
-
- # join all the action items with spaces
- text = ' '.join([item for item in parts if item is not None])
-
- # clean up separators for mutually exclusive groups
- open = r'[\[(]'
- close = r'[\])]'
- text = _re.sub(r'(%s) ' % open, r'\1', text)
- text = _re.sub(r' (%s)' % close, r'\1', text)
- text = _re.sub(r'%s *%s' % (open, close), r'', text)
- text = _re.sub(r'\(([^|]*)\)', r'\1', text)
- text = text.strip()
-
- # return the text
- return text
-
- def _format_text(self, text):
- if '%(prog)' in text:
- text = text % dict(prog=self._prog)
- text_width = self._width - self._current_indent
- indent = ' ' * self._current_indent
- return self._fill_text(text, text_width, indent) + '\n\n'
-
- def _format_action(self, action):
- # determine the required width and the entry label
- help_position = min(self._action_max_length + 2,
- self._max_help_position)
- help_width = self._width - help_position
- action_width = help_position - self._current_indent - 2
- action_header = self._format_action_invocation(action)
-
- # ho nelp; start on same line and add a final newline
- if not action.help:
- tup = self._current_indent, '', action_header
- action_header = '%*s%s\n' % tup
-
- # short action name; start on the same line and pad two spaces
- elif len(action_header) <= action_width:
- tup = self._current_indent, '', action_width, action_header
- action_header = '%*s%-*s ' % tup
- indent_first = 0
-
- # long action name; start on the next line
- else:
- tup = self._current_indent, '', action_header
- action_header = '%*s%s\n' % tup
- indent_first = help_position
-
- # collect the pieces of the action help
- parts = [action_header]
-
- # if there was help for the action, add lines of help text
- if action.help:
- help_text = self._expand_help(action)
- help_lines = self._split_lines(help_text, help_width)
- parts.append('%*s%s\n' % (indent_first, '', help_lines[0]))
- for line in help_lines[1:]:
- parts.append('%*s%s\n' % (help_position, '', line))
-
- # or add a newline if the description doesn't end with one
- elif not action_header.endswith('\n'):
- parts.append('\n')
-
- # if there are any sub-actions, add their help as well
- for subaction in self._iter_indented_subactions(action):
- parts.append(self._format_action(subaction))
-
- # return a single string
- return self._join_parts(parts)
-
- def _format_action_invocation(self, action):
- if not action.option_strings:
- metavar, = self._metavar_formatter(action, action.dest)(1)
- return metavar
-
- else:
- parts = []
-
- # if the Optional doesn't take a value, format is:
- # -s, --long
- if action.nargs == 0:
- parts.extend(action.option_strings)
-
- # if the Optional takes a value, format is:
- # -s ARGS, --long ARGS
- else:
- default = action.dest.upper()
- args_string = self._format_args(action, default)
- for option_string in action.option_strings:
- parts.append('%s %s' % (option_string, args_string))
-
- return ', '.join(parts)
-
- def _metavar_formatter(self, action, default_metavar):
- if action.metavar is not None:
- result = action.metavar
- elif action.choices is not None:
- choice_strs = [str(choice) for choice in action.choices]
- result = '{%s}' % ','.join(choice_strs)
- else:
- result = default_metavar
-
- def format(tuple_size):
- if isinstance(result, tuple):
- return result
- else:
- return (result, ) * tuple_size
- return format
-
- def _format_args(self, action, default_metavar):
- get_metavar = self._metavar_formatter(action, default_metavar)
- if action.nargs is None:
- result = '%s' % get_metavar(1)
- elif action.nargs == OPTIONAL:
- result = '[%s]' % get_metavar(1)
- elif action.nargs == ZERO_OR_MORE:
- result = '[%s [%s ...]]' % get_metavar(2)
- elif action.nargs == ONE_OR_MORE:
- result = '%s [%s ...]' % get_metavar(2)
- elif action.nargs == REMAINDER:
- result = '...'
- elif action.nargs == PARSER:
- result = '%s ...' % get_metavar(1)
- else:
- formats = ['%s' for _ in range(action.nargs)]
- result = ' '.join(formats) % get_metavar(action.nargs)
- return result
-
- def _expand_help(self, action):
- params = dict(vars(action), prog=self._prog)
- for name in list(params):
- if params[name] is SUPPRESS:
- del params[name]
- for name in list(params):
- if hasattr(params[name], '__name__'):
- params[name] = params[name].__name__
- if params.get('choices') is not None:
- choices_str = ', '.join([str(c) for c in params['choices']])
- params['choices'] = choices_str
- return self._get_help_string(action) % params
-
- def _iter_indented_subactions(self, action):
- try:
- get_subactions = action._get_subactions
- except AttributeError:
- pass
- else:
- self._indent()
- for subaction in get_subactions():
- yield subaction
- self._dedent()
-
- def _split_lines(self, text, width):
- text = self._whitespace_matcher.sub(' ', text).strip()
- return _textwrap.wrap(text, width)
-
- def _fill_text(self, text, width, indent):
- text = self._whitespace_matcher.sub(' ', text).strip()
- return _textwrap.fill(text, width, initial_indent=indent,
- subsequent_indent=indent)
-
- def _get_help_string(self, action):
- return action.help
-
-
-class RawDescriptionHelpFormatter(HelpFormatter):
- """Help message formatter which retains any formatting in descriptions.
-
- Only the name of this class is considered a public API. All the methods
- provided by the class are considered an implementation detail.
- """
-
- def _fill_text(self, text, width, indent):
- return ''.join([indent + line for line in text.splitlines(True)])
-
-
-class RawTextHelpFormatter(RawDescriptionHelpFormatter):
- """Help message formatter which retains formatting of all help text.
-
- Only the name of this class is considered a public API. All the methods
- provided by the class are considered an implementation detail.
- """
-
- def _split_lines(self, text, width):
- return text.splitlines()
-
-
-class ArgumentDefaultsHelpFormatter(HelpFormatter):
- """Help message formatter which adds default values to argument help.
-
- Only the name of this class is considered a public API. All the methods
- provided by the class are considered an implementation detail.
- """
-
- def _get_help_string(self, action):
- help = action.help
- if '%(default)' not in action.help:
- if action.default is not SUPPRESS:
- defaulting_nargs = [OPTIONAL, ZERO_OR_MORE]
- if action.option_strings or action.nargs in defaulting_nargs:
- help += ' (default: %(default)s)'
- return help
-
-
-# =====================
-# Options and Arguments
-# =====================
-
-def _get_action_name(argument):
- if argument is None:
- return None
- elif argument.option_strings:
- return '/'.join(argument.option_strings)
- elif argument.metavar not in (None, SUPPRESS):
- return argument.metavar
- elif argument.dest not in (None, SUPPRESS):
- return argument.dest
- else:
- return None
-
-
-class ArgumentError(Exception):
- """An error from creating or using an argument (optional or positional).
-
- The string value of this exception is the message, augmented with
- information about the argument that caused it.
- """
-
- def __init__(self, argument, message):
- self.argument_name = _get_action_name(argument)
- self.message = message
-
- def __str__(self):
- if self.argument_name is None:
- format = '%(message)s'
- else:
- format = 'argument %(argument_name)s: %(message)s'
- return format % dict(message=self.message,
- argument_name=self.argument_name)
-
-
-class ArgumentTypeError(Exception):
- """An error from trying to convert a command line string to a type."""
- pass
-
-
-# ==============
-# Action classes
-# ==============
-
-class Action(_AttributeHolder):
- """Information about how to convert command line strings to Python objects.
-
- Action objects are used by an ArgumentParser to represent the information
- needed to parse a single argument from one or more strings from the
- command line. The keyword arguments to the Action constructor are also
- all attributes of Action instances.
-
- Keyword Arguments:
-
- - option_strings -- A list of command-line option strings which
- should be associated with this action.
-
- - dest -- The name of the attribute to hold the created object(s)
-
- - nargs -- The number of command-line arguments that should be
- consumed. By default, one argument will be consumed and a single
- value will be produced. Other values include:
- - N (an integer) consumes N arguments (and produces a list)
- - '?' consumes zero or one arguments
- - '*' consumes zero or more arguments (and produces a list)
- - '+' consumes one or more arguments (and produces a list)
- Note that the difference between the default and nargs=1 is that
- with the default, a single value will be produced, while with
- nargs=1, a list containing a single value will be produced.
-
- - const -- The value to be produced if the option is specified and the
- option uses an action that takes no values.
-
- - default -- The value to be produced if the option is not specified.
-
- - type -- The type which the command-line arguments should be converted
- to, should be one of 'string', 'int', 'float', 'complex' or a
- callable object that accepts a single string argument. If None,
- 'string' is assumed.
-
- - choices -- A container of values that should be allowed. If not None,
- after a command-line argument has been converted to the appropriate
- type, an exception will be raised if it is not a member of this
- collection.
-
- - required -- True if the action must always be specified at the
- command line. This is only meaningful for optional command-line
- arguments.
-
- - help -- The help string describing the argument.
-
- - metavar -- The name to be used for the option's argument with the
- help string. If None, the 'dest' value will be used as the name.
- """
-
- def __init__(self,
- option_strings,
- dest,
- nargs=None,
- const=None,
- default=None,
- type=None,
- choices=None,
- required=False,
- help=None,
- metavar=None):
- self.option_strings = option_strings
- self.dest = dest
- self.nargs = nargs
- self.const = const
- self.default = default
- self.type = type
- self.choices = choices
- self.required = required
- self.help = help
- self.metavar = metavar
-
- def _get_kwargs(self):
- names = [
- 'option_strings',
- 'dest',
- 'nargs',
- 'const',
- 'default',
- 'type',
- 'choices',
- 'help',
- 'metavar',
- ]
- return [(name, getattr(self, name)) for name in names]
-
- def __call__(self, parser, namespace, values, option_string=None):
- raise NotImplementedError(_('.__call__() not defined'))
-
-
-class _StoreAction(Action):
-
- def __init__(self,
- option_strings,
- dest,
- nargs=None,
- const=None,
- default=None,
- type=None,
- choices=None,
- required=False,
- help=None,
- metavar=None):
- if nargs == 0:
- raise ValueError('nargs for store actions must be > 0; if you '
- 'have nothing to store, actions such as store '
- 'true or store const may be more appropriate')
- if const is not None and nargs != OPTIONAL:
- raise ValueError('nargs must be %r to supply const' % OPTIONAL)
- super(_StoreAction, self).__init__(
- option_strings=option_strings,
- dest=dest,
- nargs=nargs,
- const=const,
- default=default,
- type=type,
- choices=choices,
- required=required,
- help=help,
- metavar=metavar)
-
- def __call__(self, parser, namespace, values, option_string=None):
- setattr(namespace, self.dest, values)
-
-
-class _StoreConstAction(Action):
-
- def __init__(self,
- option_strings,
- dest,
- const,
- default=None,
- required=False,
- help=None,
- metavar=None):
- super(_StoreConstAction, self).__init__(
- option_strings=option_strings,
- dest=dest,
- nargs=0,
- const=const,
- default=default,
- required=required,
- help=help)
-
- def __call__(self, parser, namespace, values, option_string=None):
- setattr(namespace, self.dest, self.const)
-
-
-class _StoreTrueAction(_StoreConstAction):
-
- def __init__(self,
- option_strings,
- dest,
- default=False,
- required=False,
- help=None):
- super(_StoreTrueAction, self).__init__(
- option_strings=option_strings,
- dest=dest,
- const=True,
- default=default,
- required=required,
- help=help)
-
-
-class _StoreFalseAction(_StoreConstAction):
-
- def __init__(self,
- option_strings,
- dest,
- default=True,
- required=False,
- help=None):
- super(_StoreFalseAction, self).__init__(
- option_strings=option_strings,
- dest=dest,
- const=False,
- default=default,
- required=required,
- help=help)
-
-
-class _AppendAction(Action):
-
- def __init__(self,
- option_strings,
- dest,
- nargs=None,
- const=None,
- default=None,
- type=None,
- choices=None,
- required=False,
- help=None,
- metavar=None):
- if nargs == 0:
- raise ValueError('nargs for append actions must be > 0; if arg '
- 'strings are not supplying the value to append, '
- 'the append const action may be more appropriate')
- if const is not None and nargs != OPTIONAL:
- raise ValueError('nargs must be %r to supply const' % OPTIONAL)
- super(_AppendAction, self).__init__(
- option_strings=option_strings,
- dest=dest,
- nargs=nargs,
- const=const,
- default=default,
- type=type,
- choices=choices,
- required=required,
- help=help,
- metavar=metavar)
-
- def __call__(self, parser, namespace, values, option_string=None):
- items = _copy.copy(_ensure_value(namespace, self.dest, []))
- items.append(values)
- setattr(namespace, self.dest, items)
-
-
-class _AppendConstAction(Action):
-
- def __init__(self,
- option_strings,
- dest,
- const,
- default=None,
- required=False,
- help=None,
- metavar=None):
- super(_AppendConstAction, self).__init__(
- option_strings=option_strings,
- dest=dest,
- nargs=0,
- const=const,
- default=default,
- required=required,
- help=help,
- metavar=metavar)
-
- def __call__(self, parser, namespace, values, option_string=None):
- items = _copy.copy(_ensure_value(namespace, self.dest, []))
- items.append(self.const)
- setattr(namespace, self.dest, items)
-
-
-class _CountAction(Action):
-
- def __init__(self,
- option_strings,
- dest,
- default=None,
- required=False,
- help=None):
- super(_CountAction, self).__init__(
- option_strings=option_strings,
- dest=dest,
- nargs=0,
- default=default,
- required=required,
- help=help)
-
- def __call__(self, parser, namespace, values, option_string=None):
- new_count = _ensure_value(namespace, self.dest, 0) + 1
- setattr(namespace, self.dest, new_count)
-
-
-class _HelpAction(Action):
-
- def __init__(self,
- option_strings,
- dest=SUPPRESS,
- default=SUPPRESS,
- help=None):
- super(_HelpAction, self).__init__(
- option_strings=option_strings,
- dest=dest,
- default=default,
- nargs=0,
- help=help)
-
- def __call__(self, parser, namespace, values, option_string=None):
- parser.print_help()
- parser.exit()
-
-
-class _VersionAction(Action):
-
- def __init__(self,
- option_strings,
- version=None,
- dest=SUPPRESS,
- default=SUPPRESS,
- help="show program's version number and exit"):
- super(_VersionAction, self).__init__(
- option_strings=option_strings,
- dest=dest,
- default=default,
- nargs=0,
- help=help)
- self.version = version
-
- def __call__(self, parser, namespace, values, option_string=None):
- version = self.version
- if version is None:
- version = parser.version
- formatter = parser._get_formatter()
- formatter.add_text(version)
- parser.exit(message=formatter.format_help())
-
-
-class _SubParsersAction(Action):
-
- class _ChoicesPseudoAction(Action):
-
- def __init__(self, name, aliases, help):
- metavar = dest = name
- if aliases:
- metavar += ' (%s)' % ', '.join(aliases)
- sup = super(_SubParsersAction._ChoicesPseudoAction, self)
- sup.__init__(option_strings=[], dest=dest, help=help,
- metavar=metavar)
-
- def __init__(self,
- option_strings,
- prog,
- parser_class,
- dest=SUPPRESS,
- help=None,
- metavar=None):
-
- self._prog_prefix = prog
- self._parser_class = parser_class
- self._name_parser_map = {}
- self._choices_actions = []
-
- super(_SubParsersAction, self).__init__(
- option_strings=option_strings,
- dest=dest,
- nargs=PARSER,
- choices=self._name_parser_map,
- help=help,
- metavar=metavar)
-
- def add_parser(self, name, **kwargs):
- # set prog from the existing prefix
- if kwargs.get('prog') is None:
- kwargs['prog'] = '%s %s' % (self._prog_prefix, name)
-
- aliases = kwargs.pop('aliases', ())
-
- # create a pseudo-action to hold the choice help
- if 'help' in kwargs:
- help = kwargs.pop('help')
- choice_action = self._ChoicesPseudoAction(name, aliases, help)
- self._choices_actions.append(choice_action)
-
- # create the parser and add it to the map
- parser = self._parser_class(**kwargs)
- self._name_parser_map[name] = parser
-
- # make parser available under aliases also
- for alias in aliases:
- self._name_parser_map[alias] = parser
-
- return parser
-
- def _get_subactions(self):
- return self._choices_actions
-
- def __call__(self, parser, namespace, values, option_string=None):
- parser_name = values[0]
- arg_strings = values[1:]
-
- # set the parser name if requested
- if self.dest is not SUPPRESS:
- setattr(namespace, self.dest, parser_name)
-
- # select the parser
- try:
- parser = self._name_parser_map[parser_name]
- except KeyError:
- tup = parser_name, ', '.join(self._name_parser_map)
- msg = _('unknown parser %r (choices: %s)' % tup)
- raise ArgumentError(self, msg)
-
- # parse all the remaining options into the namespace
- # store any unrecognized options on the object, so that the top
- # level parser can decide what to do with them
- namespace, arg_strings = parser.parse_known_args(arg_strings, namespace)
- if arg_strings:
- vars(namespace).setdefault(_UNRECOGNIZED_ARGS_ATTR, [])
- getattr(namespace, _UNRECOGNIZED_ARGS_ATTR).extend(arg_strings)
-
-
-# ==============
-# Type classes
-# ==============
-
-class FileType(object):
- """Factory for creating file object types
-
- Instances of FileType are typically passed as type= arguments to the
- ArgumentParser add_argument() method.
-
- Keyword Arguments:
- - mode -- A string indicating how the file is to be opened. Accepts the
- same values as the builtin open() function.
- - bufsize -- The file's desired buffer size. Accepts the same values as
- the builtin open() function.
- """
-
- def __init__(self, mode='r', bufsize=None):
- self._mode = mode
- self._bufsize = bufsize
-
- def __call__(self, string):
- # the special argument "-" means sys.std{in,out}
- if string == '-':
- if 'r' in self._mode:
- return _sys.stdin
- elif 'w' in self._mode:
- return _sys.stdout
- else:
- msg = _('argument "-" with mode %r' % self._mode)
- raise ValueError(msg)
-
- try:
- # all other arguments are used as file names
- if self._bufsize:
- return open(string, self._mode, self._bufsize)
- else:
- return open(string, self._mode)
- except IOError:
- err = _sys.exc_info()[1]
- message = _("can't open '%s': %s")
- raise ArgumentTypeError(message % (string, err))
-
- def __repr__(self):
- args = [self._mode, self._bufsize]
- args_str = ', '.join([repr(arg) for arg in args if arg is not None])
- return '%s(%s)' % (type(self).__name__, args_str)
-
-# ===========================
-# Optional and Positional Parsing
-# ===========================
-
-class Namespace(_AttributeHolder):
- """Simple object for storing attributes.
-
- Implements equality by attribute names and values, and provides a simple
- string representation.
- """
-
- def __init__(self, **kwargs):
- for name in kwargs:
- setattr(self, name, kwargs[name])
-
- __hash__ = None
-
- def __eq__(self, other):
- return vars(self) == vars(other)
-
- def __ne__(self, other):
- return not (self == other)
-
- def __contains__(self, key):
- return key in self.__dict__
-
-
-class _ActionsContainer(object):
-
- def __init__(self,
- description,
- prefix_chars,
- argument_default,
- conflict_handler):
- super(_ActionsContainer, self).__init__()
-
- self.description = description
- self.argument_default = argument_default
- self.prefix_chars = prefix_chars
- self.conflict_handler = conflict_handler
-
- # set up registries
- self._registries = {}
-
- # register actions
- self.register('action', None, _StoreAction)
- self.register('action', 'store', _StoreAction)
- self.register('action', 'store_const', _StoreConstAction)
- self.register('action', 'store_true', _StoreTrueAction)
- self.register('action', 'store_false', _StoreFalseAction)
- self.register('action', 'append', _AppendAction)
- self.register('action', 'append_const', _AppendConstAction)
- self.register('action', 'count', _CountAction)
- self.register('action', 'help', _HelpAction)
- self.register('action', 'version', _VersionAction)
- self.register('action', 'parsers', _SubParsersAction)
-
- # raise an exception if the conflict handler is invalid
- self._get_handler()
-
- # action storage
- self._actions = []
- self._option_string_actions = {}
-
- # groups
- self._action_groups = []
- self._mutually_exclusive_groups = []
-
- # defaults storage
- self._defaults = {}
-
- # determines whether an "option" looks like a negative number
- self._negative_number_matcher = _re.compile(r'^-\d+$|^-\d*\.\d+$')
-
- # whether or not there are any optionals that look like negative
- # numbers -- uses a list so it can be shared and edited
- self._has_negative_number_optionals = []
-
- # ====================
- # Registration methods
- # ====================
- def register(self, registry_name, value, object):
- registry = self._registries.setdefault(registry_name, {})
- registry[value] = object
-
- def _registry_get(self, registry_name, value, default=None):
- return self._registries[registry_name].get(value, default)
-
- # ==================================
- # Namespace default accessor methods
- # ==================================
- def set_defaults(self, **kwargs):
- self._defaults.update(kwargs)
-
- # if these defaults match any existing arguments, replace
- # the previous default on the object with the new one
- for action in self._actions:
- if action.dest in kwargs:
- action.default = kwargs[action.dest]
-
- def get_default(self, dest):
- for action in self._actions:
- if action.dest == dest and action.default is not None:
- return action.default
- return self._defaults.get(dest, None)
-
-
- # =======================
- # Adding argument actions
- # =======================
- def add_argument(self, *args, **kwargs):
- """
- add_argument(dest, ..., name=value, ...)
- add_argument(option_string, option_string, ..., name=value, ...)
- """
-
- # if no positional args are supplied or only one is supplied and
- # it doesn't look like an option string, parse a positional
- # argument
- chars = self.prefix_chars
- if not args or len(args) == 1 and args[0][0] not in chars:
- if args and 'dest' in kwargs:
- raise ValueError('dest supplied twice for positional argument')
- kwargs = self._get_positional_kwargs(*args, **kwargs)
-
- # otherwise, we're adding an optional argument
- else:
- kwargs = self._get_optional_kwargs(*args, **kwargs)
-
- # if no default was supplied, use the parser-level default
- if 'default' not in kwargs:
- dest = kwargs['dest']
- if dest in self._defaults:
- kwargs['default'] = self._defaults[dest]
- elif self.argument_default is not None:
- kwargs['default'] = self.argument_default
-
- # create the action object, and add it to the parser
- action_class = self._pop_action_class(kwargs)
- if not _callable(action_class):
- raise ValueError('unknown action "%s"' % action_class)
- action = action_class(**kwargs)
-
- # raise an error if the action type is not callable
- type_func = self._registry_get('type', action.type, action.type)
- if not _callable(type_func):
- raise ValueError('%r is not callable' % type_func)
-
- return self._add_action(action)
-
- def add_argument_group(self, *args, **kwargs):
- group = _ArgumentGroup(self, *args, **kwargs)
- self._action_groups.append(group)
- return group
-
- def add_mutually_exclusive_group(self, **kwargs):
- group = _MutuallyExclusiveGroup(self, **kwargs)
- self._mutually_exclusive_groups.append(group)
- return group
-
- def _add_action(self, action):
- # resolve any conflicts
- self._check_conflict(action)
-
- # add to actions list
- self._actions.append(action)
- action.container = self
-
- # index the action by any option strings it has
- for option_string in action.option_strings:
- self._option_string_actions[option_string] = action
-
- # set the flag if any option strings look like negative numbers
- for option_string in action.option_strings:
- if self._negative_number_matcher.match(option_string):
- if not self._has_negative_number_optionals:
- self._has_negative_number_optionals.append(True)
-
- # return the created action
- return action
-
- def _remove_action(self, action):
- self._actions.remove(action)
-
- def _add_container_actions(self, container):
- # collect groups by titles
- title_group_map = {}
- for group in self._action_groups:
- if group.title in title_group_map:
- msg = _('cannot merge actions - two groups are named %r')
- raise ValueError(msg % (group.title))
- title_group_map[group.title] = group
-
- # map each action to its group
- group_map = {}
- for group in container._action_groups:
-
- # if a group with the title exists, use that, otherwise
- # create a new group matching the container's group
- if group.title not in title_group_map:
- title_group_map[group.title] = self.add_argument_group(
- title=group.title,
- description=group.description,
- conflict_handler=group.conflict_handler)
-
- # map the actions to their new group
- for action in group._group_actions:
- group_map[action] = title_group_map[group.title]
-
- # add container's mutually exclusive groups
- # NOTE: if add_mutually_exclusive_group ever gains title= and
- # description= then this code will need to be expanded as above
- for group in container._mutually_exclusive_groups:
- mutex_group = self.add_mutually_exclusive_group(
- required=group.required)
-
- # map the actions to their new mutex group
- for action in group._group_actions:
- group_map[action] = mutex_group
-
- # add all actions to this container or their group
- for action in container._actions:
- group_map.get(action, self)._add_action(action)
-
- def _get_positional_kwargs(self, dest, **kwargs):
- # make sure required is not specified
- if 'required' in kwargs:
- msg = _("'required' is an invalid argument for positionals")
- raise TypeError(msg)
-
- # mark positional arguments as required if at least one is
- # always required
- if kwargs.get('nargs') not in [OPTIONAL, ZERO_OR_MORE]:
- kwargs['required'] = True
- if kwargs.get('nargs') == ZERO_OR_MORE and 'default' not in kwargs:
- kwargs['required'] = True
-
- # return the keyword arguments with no option strings
- return dict(kwargs, dest=dest, option_strings=[])
-
- def _get_optional_kwargs(self, *args, **kwargs):
- # determine short and long option strings
- option_strings = []
- long_option_strings = []
- for option_string in args:
- # error on strings that don't start with an appropriate prefix
- if not option_string[0] in self.prefix_chars:
- msg = _('invalid option string %r: '
- 'must start with a character %r')
- tup = option_string, self.prefix_chars
- raise ValueError(msg % tup)
-
- # strings starting with two prefix characters are long options
- option_strings.append(option_string)
- if option_string[0] in self.prefix_chars:
- if len(option_string) > 1:
- if option_string[1] in self.prefix_chars:
- long_option_strings.append(option_string)
-
- # infer destination, '--foo-bar' -> 'foo_bar' and '-x' -> 'x'
- dest = kwargs.pop('dest', None)
- if dest is None:
- if long_option_strings:
- dest_option_string = long_option_strings[0]
- else:
- dest_option_string = option_strings[0]
- dest = dest_option_string.lstrip(self.prefix_chars)
- if not dest:
- msg = _('dest= is required for options like %r')
- raise ValueError(msg % option_string)
- dest = dest.replace('-', '_')
-
- # return the updated keyword arguments
- return dict(kwargs, dest=dest, option_strings=option_strings)
-
- def _pop_action_class(self, kwargs, default=None):
- action = kwargs.pop('action', default)
- return self._registry_get('action', action, action)
-
- def _get_handler(self):
- # determine function from conflict handler string
- handler_func_name = '_handle_conflict_%s' % self.conflict_handler
- try:
- return getattr(self, handler_func_name)
- except AttributeError:
- msg = _('invalid conflict_resolution value: %r')
- raise ValueError(msg % self.conflict_handler)
-
- def _check_conflict(self, action):
-
- # find all options that conflict with this option
- confl_optionals = []
- for option_string in action.option_strings:
- if option_string in self._option_string_actions:
- confl_optional = self._option_string_actions[option_string]
- confl_optionals.append((option_string, confl_optional))
-
- # resolve any conflicts
- if confl_optionals:
- conflict_handler = self._get_handler()
- conflict_handler(action, confl_optionals)
-
- def _handle_conflict_error(self, action, conflicting_actions):
- message = _('conflicting option string(s): %s')
- conflict_string = ', '.join([option_string
- for option_string, action
- in conflicting_actions])
- raise ArgumentError(action, message % conflict_string)
-
- def _handle_conflict_resolve(self, action, conflicting_actions):
-
- # remove all conflicting options
- for option_string, action in conflicting_actions:
-
- # remove the conflicting option
- action.option_strings.remove(option_string)
- self._option_string_actions.pop(option_string, None)
-
- # if the option now has no option string, remove it from the
- # container holding it
- if not action.option_strings:
- action.container._remove_action(action)
-
-
-class _ArgumentGroup(_ActionsContainer):
-
- def __init__(self, container, title=None, description=None, **kwargs):
- # add any missing keyword arguments by checking the container
- update = kwargs.setdefault
- update('conflict_handler', container.conflict_handler)
- update('prefix_chars', container.prefix_chars)
- update('argument_default', container.argument_default)
- super_init = super(_ArgumentGroup, self).__init__
- super_init(description=description, **kwargs)
-
- # group attributes
- self.title = title
- self._group_actions = []
-
- # share most attributes with the container
- self._registries = container._registries
- self._actions = container._actions
- self._option_string_actions = container._option_string_actions
- self._defaults = container._defaults
- self._has_negative_number_optionals = \
- container._has_negative_number_optionals
-
- def _add_action(self, action):
- action = super(_ArgumentGroup, self)._add_action(action)
- self._group_actions.append(action)
- return action
-
- def _remove_action(self, action):
- super(_ArgumentGroup, self)._remove_action(action)
- self._group_actions.remove(action)
-
-
-class _MutuallyExclusiveGroup(_ArgumentGroup):
-
- def __init__(self, container, required=False):
- super(_MutuallyExclusiveGroup, self).__init__(container)
- self.required = required
- self._container = container
-
- def _add_action(self, action):
- if action.required:
- msg = _('mutually exclusive arguments must be optional')
- raise ValueError(msg)
- action = self._container._add_action(action)
- self._group_actions.append(action)
- return action
-
- def _remove_action(self, action):
- self._container._remove_action(action)
- self._group_actions.remove(action)
-
-
-class ArgumentParser(_AttributeHolder, _ActionsContainer):
- """Object for parsing command line strings into Python objects.
-
- Keyword Arguments:
- - prog -- The name of the program (default: sys.argv[0])
- - usage -- A usage message (default: auto-generated from arguments)
- - description -- A description of what the program does
- - epilog -- Text following the argument descriptions
- - parents -- Parsers whose arguments should be copied into this one
- - formatter_class -- HelpFormatter class for printing help messages
- - prefix_chars -- Characters that prefix optional arguments
- - fromfile_prefix_chars -- Characters that prefix files containing
- additional arguments
- - argument_default -- The default value for all arguments
- - conflict_handler -- String indicating how to handle conflicts
- - add_help -- Add a -h/-help option
- """
-
- def __init__(self,
- prog=None,
- usage=None,
- description=None,
- epilog=None,
- version=None,
- parents=[],
- formatter_class=HelpFormatter,
- prefix_chars='-',
- fromfile_prefix_chars=None,
- argument_default=None,
- conflict_handler='error',
- add_help=True):
-
- if version is not None:
- import warnings
- warnings.warn(
- """The "version" argument to ArgumentParser is deprecated. """
- """Please use """
- """"add_argument(..., action='version', version="N", ...)" """
- """instead""", DeprecationWarning)
-
- superinit = super(ArgumentParser, self).__init__
- superinit(description=description,
- prefix_chars=prefix_chars,
- argument_default=argument_default,
- conflict_handler=conflict_handler)
-
- # default setting for prog
- if prog is None:
- prog = _os.path.basename(_sys.argv[0])
-
- self.prog = prog
- self.usage = usage
- self.epilog = epilog
- self.version = version
- self.formatter_class = formatter_class
- self.fromfile_prefix_chars = fromfile_prefix_chars
- self.add_help = add_help
-
- add_group = self.add_argument_group
- self._positionals = add_group(_('positional arguments'))
- self._optionals = add_group(_('optional arguments'))
- self._subparsers = None
-
- # register types
- def identity(string):
- return string
- self.register('type', None, identity)
-
- # add help and version arguments if necessary
- # (using explicit default to override global argument_default)
- if '-' in prefix_chars:
- default_prefix = '-'
- else:
- default_prefix = prefix_chars[0]
- if self.add_help:
- self.add_argument(
- default_prefix+'h', default_prefix*2+'help',
- action='help', default=SUPPRESS,
- help=_('show this help message and exit'))
- if self.version:
- self.add_argument(
- default_prefix+'v', default_prefix*2+'version',
- action='version', default=SUPPRESS,
- version=self.version,
- help=_("show program's version number and exit"))
-
- # add parent arguments and defaults
- for parent in parents:
- self._add_container_actions(parent)
- try:
- defaults = parent._defaults
- except AttributeError:
- pass
- else:
- self._defaults.update(defaults)
-
- # =======================
- # Pretty __repr__ methods
- # =======================
- def _get_kwargs(self):
- names = [
- 'prog',
- 'usage',
- 'description',
- 'version',
- 'formatter_class',
- 'conflict_handler',
- 'add_help',
- ]
- return [(name, getattr(self, name)) for name in names]
-
- # ==================================
- # Optional/Positional adding methods
- # ==================================
- def add_subparsers(self, **kwargs):
- if self._subparsers is not None:
- self.error(_('cannot have multiple subparser arguments'))
-
- # add the parser class to the arguments if it's not present
- kwargs.setdefault('parser_class', type(self))
-
- if 'title' in kwargs or 'description' in kwargs:
- title = _(kwargs.pop('title', 'subcommands'))
- description = _(kwargs.pop('description', None))
- self._subparsers = self.add_argument_group(title, description)
- else:
- self._subparsers = self._positionals
-
- # prog defaults to the usage message of this parser, skipping
- # optional arguments and with no "usage:" prefix
- if kwargs.get('prog') is None:
- formatter = self._get_formatter()
- positionals = self._get_positional_actions()
- groups = self._mutually_exclusive_groups
- formatter.add_usage(self.usage, positionals, groups, '')
- kwargs['prog'] = formatter.format_help().strip()
-
- # create the parsers action and add it to the positionals list
- parsers_class = self._pop_action_class(kwargs, 'parsers')
- action = parsers_class(option_strings=[], **kwargs)
- self._subparsers._add_action(action)
-
- # return the created parsers action
- return action
-
- def _add_action(self, action):
- if action.option_strings:
- self._optionals._add_action(action)
- else:
- self._positionals._add_action(action)
- return action
-
- def _get_optional_actions(self):
- return [action
- for action in self._actions
- if action.option_strings]
-
- def _get_positional_actions(self):
- return [action
- for action in self._actions
- if not action.option_strings]
-
- # =====================================
- # Command line argument parsing methods
- # =====================================
- def parse_args(self, args=None, namespace=None):
- args, argv = self.parse_known_args(args, namespace)
- if argv:
- msg = _('unrecognized arguments: %s')
- self.error(msg % ' '.join(argv))
- return args
-
- def parse_known_args(self, args=None, namespace=None):
- # args default to the system args
- if args is None:
- args = _sys.argv[1:]
-
- # default Namespace built from parser defaults
- if namespace is None:
- namespace = Namespace()
-
- # add any action defaults that aren't present
- for action in self._actions:
- if action.dest is not SUPPRESS:
- if not hasattr(namespace, action.dest):
- if action.default is not SUPPRESS:
- setattr(namespace, action.dest, action.default)
-
- # add any parser defaults that aren't present
- for dest in self._defaults:
- if not hasattr(namespace, dest):
- setattr(namespace, dest, self._defaults[dest])
-
- # parse the arguments and exit if there are any errors
- try:
- namespace, args = self._parse_known_args(args, namespace)
- if hasattr(namespace, _UNRECOGNIZED_ARGS_ATTR):
- args.extend(getattr(namespace, _UNRECOGNIZED_ARGS_ATTR))
- delattr(namespace, _UNRECOGNIZED_ARGS_ATTR)
- return namespace, args
- except ArgumentError:
- err = _sys.exc_info()[1]
- self.error(str(err))
-
- def _parse_known_args(self, arg_strings, namespace):
- # replace arg strings that are file references
- if self.fromfile_prefix_chars is not None:
- arg_strings = self._read_args_from_files(arg_strings)
-
- # map all mutually exclusive arguments to the other arguments
- # they can't occur with
- action_conflicts = {}
- for mutex_group in self._mutually_exclusive_groups:
- group_actions = mutex_group._group_actions
- for i, mutex_action in enumerate(mutex_group._group_actions):
- conflicts = action_conflicts.setdefault(mutex_action, [])
- conflicts.extend(group_actions[:i])
- conflicts.extend(group_actions[i + 1:])
-
- # find all option indices, and determine the arg_string_pattern
- # which has an 'O' if there is an option at an index,
- # an 'A' if there is an argument, or a '-' if there is a '--'
- option_string_indices = {}
- arg_string_pattern_parts = []
- arg_strings_iter = iter(arg_strings)
- for i, arg_string in enumerate(arg_strings_iter):
-
- # all args after -- are non-options
- if arg_string == '--':
- arg_string_pattern_parts.append('-')
- for arg_string in arg_strings_iter:
- arg_string_pattern_parts.append('A')
-
- # otherwise, add the arg to the arg strings
- # and note the index if it was an option
- else:
- option_tuple = self._parse_optional(arg_string)
- if option_tuple is None:
- pattern = 'A'
- else:
- option_string_indices[i] = option_tuple
- pattern = 'O'
- arg_string_pattern_parts.append(pattern)
-
- # join the pieces together to form the pattern
- arg_strings_pattern = ''.join(arg_string_pattern_parts)
-
- # converts arg strings to the appropriate and then takes the action
- seen_actions = set()
- seen_non_default_actions = set()
-
- def take_action(action, argument_strings, option_string=None):
- seen_actions.add(action)
- argument_values = self._get_values(action, argument_strings)
-
- # error if this argument is not allowed with other previously
- # seen arguments, assuming that actions that use the default
- # value don't really count as "present"
- if argument_values is not action.default:
- seen_non_default_actions.add(action)
- for conflict_action in action_conflicts.get(action, []):
- if conflict_action in seen_non_default_actions:
- msg = _('not allowed with argument %s')
- action_name = _get_action_name(conflict_action)
- raise ArgumentError(action, msg % action_name)
-
- # take the action if we didn't receive a SUPPRESS value
- # (e.g. from a default)
- if argument_values is not SUPPRESS:
- action(self, namespace, argument_values, option_string)
-
- # function to convert arg_strings into an optional action
- def consume_optional(start_index):
-
- # get the optional identified at this index
- option_tuple = option_string_indices[start_index]
- action, option_string, explicit_arg = option_tuple
-
- # identify additional optionals in the same arg string
- # (e.g. -xyz is the same as -x -y -z if no args are required)
- match_argument = self._match_argument
- action_tuples = []
- while True:
-
- # if we found no optional action, skip it
- if action is None:
- extras.append(arg_strings[start_index])
- return start_index + 1
-
- # if there is an explicit argument, try to match the
- # optional's string arguments to only this
- if explicit_arg is not None:
- arg_count = match_argument(action, 'A')
-
- # if the action is a single-dash option and takes no
- # arguments, try to parse more single-dash options out
- # of the tail of the option string
- chars = self.prefix_chars
- if arg_count == 0 and option_string[1] not in chars:
- action_tuples.append((action, [], option_string))
- char = option_string[0]
- option_string = char + explicit_arg[0]
- new_explicit_arg = explicit_arg[1:] or None
- optionals_map = self._option_string_actions
- if option_string in optionals_map:
- action = optionals_map[option_string]
- explicit_arg = new_explicit_arg
- else:
- msg = _('ignored explicit argument %r')
- raise ArgumentError(action, msg % explicit_arg)
-
- # if the action expect exactly one argument, we've
- # successfully matched the option; exit the loop
- elif arg_count == 1:
- stop = start_index + 1
- args = [explicit_arg]
- action_tuples.append((action, args, option_string))
- break
-
- # error if a double-dash option did not use the
- # explicit argument
- else:
- msg = _('ignored explicit argument %r')
- raise ArgumentError(action, msg % explicit_arg)
-
- # if there is no explicit argument, try to match the
- # optional's string arguments with the following strings
- # if successful, exit the loop
- else:
- start = start_index + 1
- selected_patterns = arg_strings_pattern[start:]
- arg_count = match_argument(action, selected_patterns)
- stop = start + arg_count
- args = arg_strings[start:stop]
- action_tuples.append((action, args, option_string))
- break
-
- # add the Optional to the list and return the index at which
- # the Optional's string args stopped
- assert action_tuples
- for action, args, option_string in action_tuples:
- take_action(action, args, option_string)
- return stop
-
- # the list of Positionals left to be parsed; this is modified
- # by consume_positionals()
- positionals = self._get_positional_actions()
-
- # function to convert arg_strings into positional actions
- def consume_positionals(start_index):
- # match as many Positionals as possible
- match_partial = self._match_arguments_partial
- selected_pattern = arg_strings_pattern[start_index:]
- arg_counts = match_partial(positionals, selected_pattern)
-
- # slice off the appropriate arg strings for each Positional
- # and add the Positional and its args to the list
- for action, arg_count in zip(positionals, arg_counts):
- args = arg_strings[start_index: start_index + arg_count]
- start_index += arg_count
- take_action(action, args)
-
- # slice off the Positionals that we just parsed and return the
- # index at which the Positionals' string args stopped
- positionals[:] = positionals[len(arg_counts):]
- return start_index
-
- # consume Positionals and Optionals alternately, until we have
- # passed the last option string
- extras = []
- start_index = 0
- if option_string_indices:
- max_option_string_index = max(option_string_indices)
- else:
- max_option_string_index = -1
- while start_index <= max_option_string_index:
-
- # consume any Positionals preceding the next option
- next_option_string_index = min([
- index
- for index in option_string_indices
- if index >= start_index])
- if start_index != next_option_string_index:
- positionals_end_index = consume_positionals(start_index)
-
- # only try to parse the next optional if we didn't consume
- # the option string during the positionals parsing
- if positionals_end_index > start_index:
- start_index = positionals_end_index
- continue
- else:
- start_index = positionals_end_index
-
- # if we consumed all the positionals we could and we're not
- # at the index of an option string, there were extra arguments
- if start_index not in option_string_indices:
- strings = arg_strings[start_index:next_option_string_index]
- extras.extend(strings)
- start_index = next_option_string_index
-
- # consume the next optional and any arguments for it
- start_index = consume_optional(start_index)
-
- # consume any positionals following the last Optional
- stop_index = consume_positionals(start_index)
-
- # if we didn't consume all the argument strings, there were extras
- extras.extend(arg_strings[stop_index:])
-
- # if we didn't use all the Positional objects, there were too few
- # arg strings supplied.
- if positionals:
- self.error(_('too few arguments'))
-
- # make sure all required actions were present, and convert defaults.
- for action in self._actions:
- if action not in seen_actions:
- if action.required:
- name = _get_action_name(action)
- self.error(_('argument %s is required') % name)
- else:
- # Convert action default now instead of doing it before
- # parsing arguments to avoid calling convert functions
- # twice (which may fail) if the argument was given, but
- # only if it was defined already in the namespace
- if (action.default is not None and
- isinstance(action.default, basestring) and
- hasattr(namespace, action.dest) and
- action.default is getattr(namespace, action.dest)):
- setattr(namespace, action.dest,
- self._get_value(action, action.default))
-
- # make sure all required groups had one option present
- for group in self._mutually_exclusive_groups:
- if group.required:
- for action in group._group_actions:
- if action in seen_non_default_actions:
- break
-
- # if no actions were used, report the error
- else:
- names = [_get_action_name(action)
- for action in group._group_actions
- if action.help is not SUPPRESS]
- msg = _('one of the arguments %s is required')
- self.error(msg % ' '.join(names))
-
- # return the updated namespace and the extra arguments
- return namespace, extras
-
- def _read_args_from_files(self, arg_strings):
- # expand arguments referencing files
- new_arg_strings = []
- for arg_string in arg_strings:
-
- # for regular arguments, just add them back into the list
- if arg_string[0] not in self.fromfile_prefix_chars:
- new_arg_strings.append(arg_string)
-
- # replace arguments referencing files with the file content
- else:
- try:
- args_file = open(arg_string[1:])
- try:
- arg_strings = []
- for arg_line in args_file.read().splitlines():
- for arg in self.convert_arg_line_to_args(arg_line):
- arg_strings.append(arg)
- arg_strings = self._read_args_from_files(arg_strings)
- new_arg_strings.extend(arg_strings)
- finally:
- args_file.close()
- except IOError:
- err = _sys.exc_info()[1]
- self.error(str(err))
-
- # return the modified argument list
- return new_arg_strings
-
- def convert_arg_line_to_args(self, arg_line):
- return [arg_line]
-
- def _match_argument(self, action, arg_strings_pattern):
- # match the pattern for this action to the arg strings
- nargs_pattern = self._get_nargs_pattern(action)
- match = _re.match(nargs_pattern, arg_strings_pattern)
-
- # raise an exception if we weren't able to find a match
- if match is None:
- nargs_errors = {
- None: _('expected one argument'),
- OPTIONAL: _('expected at most one argument'),
- ONE_OR_MORE: _('expected at least one argument'),
- }
- default = _('expected %s argument(s)') % action.nargs
- msg = nargs_errors.get(action.nargs, default)
- raise ArgumentError(action, msg)
-
- # return the number of arguments matched
- return len(match.group(1))
-
- def _match_arguments_partial(self, actions, arg_strings_pattern):
- # progressively shorten the actions list by slicing off the
- # final actions until we find a match
- result = []
- for i in range(len(actions), 0, -1):
- actions_slice = actions[:i]
- pattern = ''.join([self._get_nargs_pattern(action)
- for action in actions_slice])
- match = _re.match(pattern, arg_strings_pattern)
- if match is not None:
- result.extend([len(string) for string in match.groups()])
- break
-
- # return the list of arg string counts
- return result
-
- def _parse_optional(self, arg_string):
- # if it's an empty string, it was meant to be a positional
- if not arg_string:
- return None
-
- # if it doesn't start with a prefix, it was meant to be positional
- if not arg_string[0] in self.prefix_chars:
- return None
-
- # if the option string is present in the parser, return the action
- if arg_string in self._option_string_actions:
- action = self._option_string_actions[arg_string]
- return action, arg_string, None
-
- # if it's just a single character, it was meant to be positional
- if len(arg_string) == 1:
- return None
-
- # if the option string before the "=" is present, return the action
- if '=' in arg_string:
- option_string, explicit_arg = arg_string.split('=', 1)
- if option_string in self._option_string_actions:
- action = self._option_string_actions[option_string]
- return action, option_string, explicit_arg
-
- # search through all possible prefixes of the option string
- # and all actions in the parser for possible interpretations
- option_tuples = self._get_option_tuples(arg_string)
-
- # if multiple actions match, the option string was ambiguous
- if len(option_tuples) > 1:
- options = ', '.join([option_string
- for action, option_string, explicit_arg in option_tuples])
- tup = arg_string, options
- self.error(_('ambiguous option: %s could match %s') % tup)
-
- # if exactly one action matched, this segmentation is good,
- # so return the parsed action
- elif len(option_tuples) == 1:
- option_tuple, = option_tuples
- return option_tuple
-
- # if it was not found as an option, but it looks like a negative
- # number, it was meant to be positional
- # unless there are negative-number-like options
- if self._negative_number_matcher.match(arg_string):
- if not self._has_negative_number_optionals:
- return None
-
- # if it contains a space, it was meant to be a positional
- if ' ' in arg_string:
- return None
-
- # it was meant to be an optional but there is no such option
- # in this parser (though it might be a valid option in a subparser)
- return None, arg_string, None
-
- def _get_option_tuples(self, option_string):
- result = []
-
- # option strings starting with two prefix characters are only
- # split at the '='
- chars = self.prefix_chars
- if option_string[0] in chars and option_string[1] in chars:
- if '=' in option_string:
- option_prefix, explicit_arg = option_string.split('=', 1)
- else:
- option_prefix = option_string
- explicit_arg = None
- for option_string in self._option_string_actions:
- if option_string.startswith(option_prefix):
- action = self._option_string_actions[option_string]
- tup = action, option_string, explicit_arg
- result.append(tup)
-
- # single character options can be concatenated with their arguments
- # but multiple character options always have to have their argument
- # separate
- elif option_string[0] in chars and option_string[1] not in chars:
- option_prefix = option_string
- explicit_arg = None
- short_option_prefix = option_string[:2]
- short_explicit_arg = option_string[2:]
-
- for option_string in self._option_string_actions:
- if option_string == short_option_prefix:
- action = self._option_string_actions[option_string]
- tup = action, option_string, short_explicit_arg
- result.append(tup)
- elif option_string.startswith(option_prefix):
- action = self._option_string_actions[option_string]
- tup = action, option_string, explicit_arg
- result.append(tup)
-
- # shouldn't ever get here
- else:
- self.error(_('unexpected option string: %s') % option_string)
-
- # return the collected option tuples
- return result
-
- def _get_nargs_pattern(self, action):
- # in all examples below, we have to allow for '--' args
- # which are represented as '-' in the pattern
- nargs = action.nargs
-
- # the default (None) is assumed to be a single argument
- if nargs is None:
- nargs_pattern = '(-*A-*)'
-
- # allow zero or one arguments
- elif nargs == OPTIONAL:
- nargs_pattern = '(-*A?-*)'
-
- # allow zero or more arguments
- elif nargs == ZERO_OR_MORE:
- nargs_pattern = '(-*[A-]*)'
-
- # allow one or more arguments
- elif nargs == ONE_OR_MORE:
- nargs_pattern = '(-*A[A-]*)'
-
- # allow any number of options or arguments
- elif nargs == REMAINDER:
- nargs_pattern = '([-AO]*)'
-
- # allow one argument followed by any number of options or arguments
- elif nargs == PARSER:
- nargs_pattern = '(-*A[-AO]*)'
-
- # all others should be integers
- else:
- nargs_pattern = '(-*%s-*)' % '-*'.join('A' * nargs)
-
- # if this is an optional action, -- is not allowed
- if action.option_strings:
- nargs_pattern = nargs_pattern.replace('-*', '')
- nargs_pattern = nargs_pattern.replace('-', '')
-
- # return the pattern
- return nargs_pattern
-
- # ========================
- # Value conversion methods
- # ========================
- def _get_values(self, action, arg_strings):
- # for everything but PARSER args, strip out '--'
- if action.nargs not in [PARSER, REMAINDER]:
- arg_strings = [s for s in arg_strings if s != '--']
-
- # optional argument produces a default when not present
- if not arg_strings and action.nargs == OPTIONAL:
- if action.option_strings:
- value = action.const
- else:
- value = action.default
- if isinstance(value, basestring):
- value = self._get_value(action, value)
- self._check_value(action, value)
-
- # when nargs='*' on a positional, if there were no command-line
- # args, use the default if it is anything other than None
- elif (not arg_strings and action.nargs == ZERO_OR_MORE and
- not action.option_strings):
- if action.default is not None:
- value = action.default
- else:
- value = arg_strings
- self._check_value(action, value)
-
- # single argument or optional argument produces a single value
- elif len(arg_strings) == 1 and action.nargs in [None, OPTIONAL]:
- arg_string, = arg_strings
- value = self._get_value(action, arg_string)
- self._check_value(action, value)
-
- # REMAINDER arguments convert all values, checking none
- elif action.nargs == REMAINDER:
- value = [self._get_value(action, v) for v in arg_strings]
-
- # PARSER arguments convert all values, but check only the first
- elif action.nargs == PARSER:
- value = [self._get_value(action, v) for v in arg_strings]
- self._check_value(action, value[0])
-
- # all other types of nargs produce a list
- else:
- value = [self._get_value(action, v) for v in arg_strings]
- for v in value:
- self._check_value(action, v)
-
- # return the converted value
- return value
-
- def _get_value(self, action, arg_string):
- type_func = self._registry_get('type', action.type, action.type)
- if not _callable(type_func):
- msg = _('%r is not callable')
- raise ArgumentError(action, msg % type_func)
-
- # convert the value to the appropriate type
- try:
- result = type_func(arg_string)
-
- # ArgumentTypeErrors indicate errors
- except ArgumentTypeError:
- name = getattr(action.type, '__name__', repr(action.type))
- msg = str(_sys.exc_info()[1])
- raise ArgumentError(action, msg)
-
- # TypeErrors or ValueErrors also indicate errors
- except (TypeError, ValueError):
- name = getattr(action.type, '__name__', repr(action.type))
- msg = _('invalid %s value: %r')
- raise ArgumentError(action, msg % (name, arg_string))
-
- # return the converted value
- return result
-
- def _check_value(self, action, value):
- # converted value must be one of the choices (if specified)
- if action.choices is not None and value not in action.choices:
- tup = value, ', '.join(map(repr, action.choices))
- msg = _('invalid choice: %r (choose from %s)') % tup
- raise ArgumentError(action, msg)
-
- # =======================
- # Help-formatting methods
- # =======================
- def format_usage(self):
- formatter = self._get_formatter()
- formatter.add_usage(self.usage, self._actions,
- self._mutually_exclusive_groups)
- return formatter.format_help()
-
- def format_help(self):
- formatter = self._get_formatter()
-
- # usage
- formatter.add_usage(self.usage, self._actions,
- self._mutually_exclusive_groups)
-
- # description
- formatter.add_text(self.description)
-
- # positionals, optionals and user-defined groups
- for action_group in self._action_groups:
- formatter.start_section(action_group.title)
- formatter.add_text(action_group.description)
- formatter.add_arguments(action_group._group_actions)
- formatter.end_section()
-
- # epilog
- formatter.add_text(self.epilog)
-
- # determine help from format above
- return formatter.format_help()
-
- def format_version(self):
- import warnings
- warnings.warn(
- 'The format_version method is deprecated -- the "version" '
- 'argument to ArgumentParser is no longer supported.',
- DeprecationWarning)
- formatter = self._get_formatter()
- formatter.add_text(self.version)
- return formatter.format_help()
-
- def _get_formatter(self):
- return self.formatter_class(prog=self.prog)
-
- # =====================
- # Help-printing methods
- # =====================
- def print_usage(self, file=None):
- if file is None:
- file = _sys.stdout
- self._print_message(self.format_usage(), file)
-
- def print_help(self, file=None):
- if file is None:
- file = _sys.stdout
- self._print_message(self.format_help(), file)
-
- def print_version(self, file=None):
- import warnings
- warnings.warn(
- 'The print_version method is deprecated -- the "version" '
- 'argument to ArgumentParser is no longer supported.',
- DeprecationWarning)
- self._print_message(self.format_version(), file)
-
- def _print_message(self, message, file=None):
- if message:
- if file is None:
- file = _sys.stderr
- file.write(message)
-
- # ===============
- # Exiting methods
- # ===============
- def exit(self, status=0, message=None):
- if message:
- self._print_message(message, _sys.stderr)
- _sys.exit(status)
-
- def error(self, message):
- """error(message: string)
-
- Prints a usage message incorporating the message to stderr and
- exits.
-
- If you override this in a subclass, it should not return -- it
- should either exit or raise an exception.
- """
- self.print_usage(_sys.stderr)
- self.exit(2, _('%s: error: %s\n') % (self.prog, message))
--
2.18.0.rc1.1.g3f1ff2140
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [Qemu-devel] [PULL 13/13] python: Remove scripts/ordereddict.py
2018-06-11 17:42 [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11 Eduardo Habkost
` (11 preceding siblings ...)
2018-06-11 17:42 ` [Qemu-devel] [PULL 12/13] python: Remove scripts/argparse.py Eduardo Habkost
@ 2018-06-11 17:42 ` Eduardo Habkost
2018-06-11 18:36 ` [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11 no-reply
` (2 subsequent siblings)
15 siblings, 0 replies; 19+ messages in thread
From: Eduardo Habkost @ 2018-06-11 17:42 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Eduardo Habkost, Cleber Rosa
Python 2.7 (the minimum Python version we require) provides
collections.OrderedDict on the standard library, so we don't need
to carry our own implementation.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180608175252.25110-3-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Makefile | 1 -
scripts/ordereddict.py | 128 -----------------------------------------
scripts/qapi/common.py | 5 +-
tests/Makefile.include | 1 -
4 files changed, 1 insertion(+), 134 deletions(-)
delete mode 100644 scripts/ordereddict.py
diff --git a/Makefile b/Makefile
index 023b3437ec..6c6664d9a3 100644
--- a/Makefile
+++ b/Makefile
@@ -567,7 +567,6 @@ $(SRC_PATH)/scripts/qapi/types.py \
$(SRC_PATH)/scripts/qapi/visit.py \
$(SRC_PATH)/scripts/qapi/common.py \
$(SRC_PATH)/scripts/qapi/doc.py \
-$(SRC_PATH)/scripts/ordereddict.py \
$(SRC_PATH)/scripts/qapi-gen.py
qga/qapi-generated/qga-qapi-types.c qga/qapi-generated/qga-qapi-types.h \
diff --git a/scripts/ordereddict.py b/scripts/ordereddict.py
deleted file mode 100644
index 68ed340b33..0000000000
--- a/scripts/ordereddict.py
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright (c) 2009 Raymond Hettinger
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation files
-# (the "Software"), to deal in the Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, sublicense, and/or sell copies of the Software,
-# and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-
-from UserDict import DictMixin
-
-
-class OrderedDict(dict, DictMixin):
-
- def __init__(self, *args, **kwds):
- if len(args) > 1:
- raise TypeError('expected at most 1 arguments, got %d' % len(args))
- try:
- self.__end
- except AttributeError:
- self.clear()
- self.update(*args, **kwds)
-
- def clear(self):
- self.__end = end = []
- end += [None, end, end] # sentinel node for doubly linked list
- self.__map = {} # key --> [key, prev, next]
- dict.clear(self)
-
- def __setitem__(self, key, value):
- if key not in self:
- end = self.__end
- curr = end[1]
- curr[2] = end[1] = self.__map[key] = [key, curr, end]
- dict.__setitem__(self, key, value)
-
- def __delitem__(self, key):
- dict.__delitem__(self, key)
- key, prev, next = self.__map.pop(key)
- prev[2] = next
- next[1] = prev
-
- def __iter__(self):
- end = self.__end
- curr = end[2]
- while curr is not end:
- yield curr[0]
- curr = curr[2]
-
- def __reversed__(self):
- end = self.__end
- curr = end[1]
- while curr is not end:
- yield curr[0]
- curr = curr[1]
-
- def popitem(self, last=True):
- if not self:
- raise KeyError('dictionary is empty')
- if last:
- key = next(reversed(self))
- else:
- key = next(iter(self))
- value = self.pop(key)
- return key, value
-
- def __reduce__(self):
- items = [[k, self[k]] for k in self]
- tmp = self.__map, self.__end
- del self.__map, self.__end
- inst_dict = vars(self).copy()
- self.__map, self.__end = tmp
- if inst_dict:
- return (self.__class__, (items,), inst_dict)
- return self.__class__, (items,)
-
- def keys(self):
- return list(self)
-
- setdefault = DictMixin.setdefault
- update = DictMixin.update
- pop = DictMixin.pop
- values = DictMixin.values
- items = DictMixin.items
- iterkeys = DictMixin.iterkeys
- itervalues = DictMixin.itervalues
- iteritems = DictMixin.iteritems
-
- def __repr__(self):
- if not self:
- return '%s()' % (self.__class__.__name__,)
- return '%s(%r)' % (self.__class__.__name__, self.items())
-
- def copy(self):
- return self.__class__(self)
-
- @classmethod
- def fromkeys(cls, iterable, value=None):
- d = cls()
- for key in iterable:
- d[key] = value
- return d
-
- def __eq__(self, other):
- if isinstance(other, OrderedDict):
- if len(self) != len(other):
- return False
- for p, q in zip(self.items(), other.items()):
- if p != q:
- return False
- return True
- return dict.__eq__(self, other)
-
- def __ne__(self, other):
- return not self == other
diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
index e82990f0f2..2462fc0291 100644
--- a/scripts/qapi/common.py
+++ b/scripts/qapi/common.py
@@ -16,10 +16,7 @@ import errno
import os
import re
import string
-try:
- from collections import OrderedDict
-except:
- from ordereddict import OrderedDict
+from collections import OrderedDict
builtin_types = {
'null': 'QTYPE_QNULL',
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 400d8890e7..ccedacebd5 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -31,7 +31,6 @@ $(SRC_PATH)/scripts/qapi/types.py \
$(SRC_PATH)/scripts/qapi/visit.py \
$(SRC_PATH)/scripts/qapi/common.py \
$(SRC_PATH)/scripts/qapi/doc.py \
-$(SRC_PATH)/scripts/ordereddict.py \
$(SRC_PATH)/scripts/qapi-gen.py
# Get the list of all supported sysemu targets
--
2.18.0.rc1.1.g3f1ff2140
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11
2018-06-11 17:42 [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11 Eduardo Habkost
` (12 preceding siblings ...)
2018-06-11 17:42 ` [Qemu-devel] [PULL 13/13] python: Remove scripts/ordereddict.py Eduardo Habkost
@ 2018-06-11 18:36 ` no-reply
2018-06-12 11:42 ` Peter Maydell
2018-06-19 11:13 ` Peter Maydell
15 siblings, 0 replies; 19+ messages in thread
From: no-reply @ 2018-06-11 18:36 UTC (permalink / raw)
To: ehabkost; +Cc: famz, peter.maydell, qemu-devel, crosa
Hi,
This series seems to have some coding style problems. See output below for
more information:
Type: series
Message-id: 20180611174243.31070-1-ehabkost@redhat.com
Subject: [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11
=== TEST SCRIPT BEGIN ===
#!/bin/bash
BASE=base
n=1
total=$(git log --oneline $BASE.. | wc -l)
failed=0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
commits="$(git log --format=%H --reverse $BASE..)"
for c in $commits; do
echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..."
if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then
failed=1
echo
fi
n=$((n+1))
done
exit $failed
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'
9befc781a3 python: Remove scripts/ordereddict.py
5c22101565 python: Remove scripts/argparse.py
1c07589cb9 configure: Require Python 2.7 or newer
47a73d5f8a python: futurize -f lib2to3.fixes.fix_numliterals
e0512db6fe python: futurize -f lib2to3.fixes.fix_except
ff4f6bf56d python: futurize -f lib2to3.fixes.fix_renames
029e4039c4 python: futurize -f lib2to3.fixes.fix_tuple_params
d560c7b24d python: futurize -f lib2to3.fixes.fix_reduce
ff1b0480fe python: futurize -f lib2to3.fixes.fix_standarderror
89e08e39a0 python: futurize -f lib2to3.fixes.fix_has_key
77e2e30a73 python: futurize -f libfuturize.fixes.fix_next_call
8cf63c3b07 python: futurize -f libfuturize.fixes.fix_absolute_import
e631df3427 python: futurize -f libfuturize.fixes.fix_print_with_import
=== OUTPUT BEGIN ===
Checking PATCH 1/13: python: futurize -f libfuturize.fixes.fix_print_with_import...
ERROR: line over 90 characters
#45: FILE: scripts/analyse-9p-simpletrace.py:86:
+ print("RERROR (tag =", tag, ", id =", symbol_9p[id], ", err = \"", os.strerror(err), "\")")
ERROR: line over 90 characters
#49: FILE: scripts/analyse-9p-simpletrace.py:89:
+ print("TVERSION (tag =", tag, ", msize =", msize, ", version =", version, ")")
ERROR: line over 90 characters
#53: FILE: scripts/analyse-9p-simpletrace.py:92:
+ print("RVERSION (tag =", tag, ", msize =", msize, ", version =", version, ")")
ERROR: line over 90 characters
#57: FILE: scripts/analyse-9p-simpletrace.py:95:
+ print("TATTACH (tag =", tag, ", fid =", fid, ", afid =", afid, ", uname =", uname, ", aname =", aname, ")")
ERROR: line over 90 characters
#61: FILE: scripts/analyse-9p-simpletrace.py:98:
+ print("RATTACH (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "})")
ERROR: line over 90 characters
#69: FILE: scripts/analyse-9p-simpletrace.py:104:
+ print("RSTAT (tag =", tag, ", mode =", mode, ", atime =", atime, ", mtime =", mtime, ", length =", length, ")")
ERROR: line over 90 characters
#73: FILE: scripts/analyse-9p-simpletrace.py:107:
+ print("TGETATTR (tag =", tag, ", fid =", fid, ", request_mask =", hex(request_mask), ")")
ERROR: line over 90 characters
#77: FILE: scripts/analyse-9p-simpletrace.py:110:
+ print("RGETATTR (tag =", tag, ", result_mask =", hex(result_mask), ", mode =", oct(mode), ", uid =", uid, ", gid =", gid, ")")
ERROR: line over 90 characters
#81: FILE: scripts/analyse-9p-simpletrace.py:113:
+ print("TWALK (tag =", tag, ", fid =", fid, ", newfid =", newfid, ", nwnames =", nwnames, ")")
ERROR: line over 90 characters
#85: FILE: scripts/analyse-9p-simpletrace.py:116:
+ print("RWALK (tag =", tag, ", nwnames =", nwnames, ", qids =", hex(qids), ")")
WARNING: line over 80 characters
#89: FILE: scripts/analyse-9p-simpletrace.py:119:
+ print("TOPEN (tag =", tag, ", fid =", fid, ", mode =", oct(mode), ")")
ERROR: line over 90 characters
#93: FILE: scripts/analyse-9p-simpletrace.py:122:
+ print("ROPEN (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "}, iounit =", iounit, ")")
ERROR: line over 90 characters
#97: FILE: scripts/analyse-9p-simpletrace.py:125:
+ print("TLCREATE (tag =", tag, ", dfid =", dfid, ", flags =", oct(flags), ", mode =", oct(mode), ", gid =", gid, ")")
ERROR: line over 90 characters
#101: FILE: scripts/analyse-9p-simpletrace.py:128:
+ print("RLCREATE (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "}, iounit =", iounit, ")")
WARNING: line over 80 characters
#105: FILE: scripts/analyse-9p-simpletrace.py:131:
+ print("TFSYNC (tag =", tag, ", fid =", fid, ", datasync =", datasync, ")")
ERROR: line over 90 characters
#113: FILE: scripts/analyse-9p-simpletrace.py:137:
+ print("TREAD (tag =", tag, ", fid =", fid, ", off =", off, ", max_count =", max_count, ")")
WARNING: line over 80 characters
#117: FILE: scripts/analyse-9p-simpletrace.py:140:
+ print("RREAD (tag =", tag, ", count =", count, ", err =", err, ")")
ERROR: line over 90 characters
#121: FILE: scripts/analyse-9p-simpletrace.py:143:
+ print("TREADDIR (tag =", tag, ", fid =", fid, ", offset =", offset, ", max_count =", max_count, ")")
ERROR: line over 90 characters
#125: FILE: scripts/analyse-9p-simpletrace.py:146:
+ print("RREADDIR (tag =", tag, ", count =", count, ", retval =", retval, ")")
ERROR: line over 90 characters
#129: FILE: scripts/analyse-9p-simpletrace.py:149:
+ print("TWRITE (tag =", tag, ", fid =", fid, ", off =", off, ", count =", count, ", cnt =", cnt, ")")
WARNING: line over 80 characters
#133: FILE: scripts/analyse-9p-simpletrace.py:152:
+ print("RWRITE (tag =", tag, ", total =", total, ", err =", err, ")")
ERROR: line over 90 characters
#137: FILE: scripts/analyse-9p-simpletrace.py:155:
+ print("TCREATE (tag =", tag, ", fid =", fid, ", perm =", oct(perm), ", name =", name, ", mode =", oct(mode), ")")
ERROR: line over 90 characters
#141: FILE: scripts/analyse-9p-simpletrace.py:158:
+ print("RCREATE (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "}, iounit =", iounit, ")")
ERROR: line over 90 characters
#145: FILE: scripts/analyse-9p-simpletrace.py:161:
+ print("TSYMLINK (tag =", tag, ", fid =", fid, ", name =", name, ", symname =", symname, ", gid =", gid, ")")
ERROR: line over 90 characters
#149: FILE: scripts/analyse-9p-simpletrace.py:164:
+ print("RSYMLINK (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "})")
ERROR: line over 90 characters
#157: FILE: scripts/analyse-9p-simpletrace.py:170:
+ print("TLINK (tag =", tag, ", dfid =", dfid, ", oldfid =", oldfid, ", name =", name, ")")
ERROR: line over 90 characters
#165: FILE: scripts/analyse-9p-simpletrace.py:176:
+ print("TWSTAT (tag =", tag, ", fid =", fid, ", mode =", oct(mode), ", atime =", atime, "mtime =", mtime, ")")
ERROR: line over 90 characters
#169: FILE: scripts/analyse-9p-simpletrace.py:179:
+ print("TMKNOD (tag =", tag, ", fid =", fid, ", mode =", oct(mode), ", major =", major, ", minor =", minor, ")")
ERROR: line over 90 characters
#173: FILE: scripts/analyse-9p-simpletrace.py:182:
+ print("TLOCK (tag =", tag, ", fid =", fid, "type =", type, ", start =", start, ", length =", length, ")")
ERROR: line over 90 characters
#181: FILE: scripts/analyse-9p-simpletrace.py:188:
+ print("TGETLOCK (tag =", tag, ", fid =", fid, "type =", type, ", start =", start, ", length =", length, ")")
ERROR: line over 90 characters
#185: FILE: scripts/analyse-9p-simpletrace.py:191:
+ print("RGETLOCK (tag =", tag, "type =", type, ", start =", start, ", length =", length, ", proc_id =", proc_id, ")")
ERROR: line over 90 characters
#189: FILE: scripts/analyse-9p-simpletrace.py:194:
+ print("TMKDIR (tag =", tag, ", fid =", fid, ", name =", name, ", mode =", mode, ", gid =", gid, ")")
ERROR: line over 90 characters
#193: FILE: scripts/analyse-9p-simpletrace.py:197:
+ print("RMKDIR (tag =", tag, ", qid={type =", type, ", version =", version, ", path =", path, "}, err =", err, ")")
ERROR: line over 90 characters
#197: FILE: scripts/analyse-9p-simpletrace.py:200:
+ print("TXATTRWALK (tag =", tag, ", fid =", fid, ", newfid =", newfid, ", xattr name =", name, ")")
ERROR: line over 90 characters
#205: FILE: scripts/analyse-9p-simpletrace.py:206:
+ print("TXATTRCREATE (tag =", tag, ", fid =", fid, ", name =", name, ", xattrsize =", size, ", flags =", flags, ")")
WARNING: line over 80 characters
#848: FILE: scripts/vmstate-static-checker.py:182:
+ print("expected field \"" + s_item["field"] + "\",", end=' ')
WARNING: line over 80 characters
#904: FILE: scripts/vmstate-static-checker.py:293:
+ print("Section \"" + sec + "\", Description \"" + desc + "\":", end=' ')
WARNING: line over 80 characters
#1012: FILE: scripts/vmstate-static-checker.py:419:
+ print("Section \"" + sec + "\": Entry \"" + entry + "\"", end=' ')
WARNING: line over 80 characters
#1147: FILE: tests/image-fuzzer/runner.py:41:
+ "'--config' and '--command' options are not supported.", file=sys.stderr)
WARNING: line over 80 characters
#1158: FILE: tests/image-fuzzer/runner.py:161:
+ print("Error: The working directory '%s' cannot be used. Reason: %s"\
ERROR: line over 90 characters
#1187: FILE: tests/image-fuzzer/runner.py:359:
+ print("Error: %s\n\nTry 'runner.py --help' for more information" % e, file=sys.stderr)
WARNING: line over 80 characters
#1249: FILE: tests/migration/guestperf/engine.py:121:
+ print("Sleeping %d seconds for initial guest workload run" % self._sleep)
ERROR: line over 90 characters
#1267: FILE: tests/migration/guestperf/engine.py:220:
+ print("Sleeping %d seconds for final guest workload run" % self._sleep)
WARNING: line over 80 characters
#1276: FILE: tests/migration/guestperf/engine.py:231:
+ print("Iter %d: remain %5dMB of %5dMB (total %5dMB @ %5dMb/sec)" % (
ERROR: line over 90 characters
#1288: FILE: tests/migration/guestperf/engine.py:241:
+ print("No completion after %d iterations over RAM" % scenario._max_iters)
ERROR: line over 90 characters
#1304: FILE: tests/migration/guestperf/engine.py:255:
+ print("Switching to post-copy after %d iterations" % scenario._post_copy_iters)
WARNING: line over 80 characters
#1313: FILE: tests/migration/guestperf/engine.py:263:
+ print("Pausing VM after %d iterations" % scenario._pause_iters)
ERROR: line over 90 characters
#1671: FILE: tests/qemu-iotests/qcow2.py:226:
+ print("'%s' is not a valid group, try 'incompatible', 'compatible', or 'autoclear'" % group)
total: 36 errors, 12 warnings, 1495 lines checked
Your patch has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Checking PATCH 2/13: python: futurize -f libfuturize.fixes.fix_absolute_import...
Checking PATCH 3/13: python: futurize -f libfuturize.fixes.fix_next_call...
Checking PATCH 4/13: python: futurize -f lib2to3.fixes.fix_has_key...
Checking PATCH 5/13: python: futurize -f lib2to3.fixes.fix_standarderror...
Checking PATCH 6/13: python: futurize -f lib2to3.fixes.fix_reduce...
Checking PATCH 7/13: python: futurize -f lib2to3.fixes.fix_tuple_params...
Checking PATCH 8/13: python: futurize -f lib2to3.fixes.fix_renames...
Checking PATCH 9/13: python: futurize -f lib2to3.fixes.fix_except...
Checking PATCH 10/13: python: futurize -f lib2to3.fixes.fix_numliterals...
Checking PATCH 11/13: configure: Require Python 2.7 or newer...
Checking PATCH 12/13: python: Remove scripts/argparse.py...
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#15:
deleted file mode 100644
total: 0 errors, 1 warnings, 0 lines checked
Your patch has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Checking PATCH 13/13: python: Remove scripts/ordereddict.py...
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#28:
deleted file mode 100644
total: 0 errors, 1 warnings, 25 lines checked
Your patch has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===
Test command exited with code: 1
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11
2018-06-11 17:42 [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11 Eduardo Habkost
` (13 preceding siblings ...)
2018-06-11 18:36 ` [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11 no-reply
@ 2018-06-12 11:42 ` Peter Maydell
2018-06-19 11:13 ` Peter Maydell
15 siblings, 0 replies; 19+ messages in thread
From: Peter Maydell @ 2018-06-12 11:42 UTC (permalink / raw)
To: Eduardo Habkost; +Cc: QEMU Developers, Cleber Rosa
On 11 June 2018 at 18:42, Eduardo Habkost <ehabkost@redhat.com> wrote:
> The following changes since commit 0d2fa03dae4fbe185a082f361342b1e30aed4582:
>
> Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20180608' into staging (2018-06-08 16:26:51 +0100)
>
> are available in the Git repository at:
>
> git://github.com/ehabkost/qemu.git tags/python-next-pull-request
>
> for you to fetch changes up to c7883412440905b41dde7e70f4af782932e80e90:
>
> python: Remove scripts/ordereddict.py (2018-06-08 16:40:54 -0300)
>
> ----------------------------------------------------------------
> Python queue, 2018-06-11
>
> * Make code compatible with Python 3 using 'futurize --stage1'
> * Require Python >= 2.7 and remove Python 2.6 compatibility
> modules
>
> ----------------------------------------------------------------
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11
2018-06-11 17:42 [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11 Eduardo Habkost
` (14 preceding siblings ...)
2018-06-12 11:42 ` Peter Maydell
@ 2018-06-19 11:13 ` Peter Maydell
2018-06-19 12:05 ` Eduardo Habkost
15 siblings, 1 reply; 19+ messages in thread
From: Peter Maydell @ 2018-06-19 11:13 UTC (permalink / raw)
To: Eduardo Habkost; +Cc: QEMU Developers, Cleber Rosa, Alex Bennée
On 11 June 2018 at 18:42, Eduardo Habkost <ehabkost@redhat.com> wrote:
> The following changes since commit 0d2fa03dae4fbe185a082f361342b1e30aed4582:
>
> Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20180608' into staging (2018-06-08 16:26:51 +0100)
>
> are available in the Git repository at:
>
> git://github.com/ehabkost/qemu.git tags/python-next-pull-request
>
> for you to fetch changes up to c7883412440905b41dde7e70f4af782932e80e90:
>
> python: Remove scripts/ordereddict.py (2018-06-08 16:40:54 -0300)
>
> ----------------------------------------------------------------
> Python queue, 2018-06-11
>
> * Make code compatible with Python 3 using 'futurize --stage1'
> * Require Python >= 2.7 and remove Python 2.6 compatibility
> modules
>
> ----------------------------------------------------------------
Hi; I noticed that running configure on my machine can now produce a
python traceback from docker.py:
make: Entering directory '/home/petmay01/linaro/qemu-for-merges/build/alldbg'
config-host.mak is out-of-date, running configure
Traceback (most recent call last):
File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py",
line 29, in <module>
from StringIO import StringIO
ImportError: No module named 'StringIO'
Install prefix /usr/local
[etc]
I don't know if this is because of this change, but this is the
most recent change involving python...
The error also doesn't cause configure to fail, which is probably
a separate bug.
thanks
-- PMM
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11
2018-06-19 11:13 ` Peter Maydell
@ 2018-06-19 12:05 ` Eduardo Habkost
2018-06-19 12:13 ` Peter Maydell
0 siblings, 1 reply; 19+ messages in thread
From: Eduardo Habkost @ 2018-06-19 12:05 UTC (permalink / raw)
To: Peter Maydell
Cc: QEMU Developers, Cleber Rosa, Alex Bennée, Fam Zheng,
Philippe Mathieu-Daudé
On Tue, Jun 19, 2018 at 12:13:41PM +0100, Peter Maydell wrote:
> On 11 June 2018 at 18:42, Eduardo Habkost <ehabkost@redhat.com> wrote:
> > The following changes since commit 0d2fa03dae4fbe185a082f361342b1e30aed4582:
> >
> > Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20180608' into staging (2018-06-08 16:26:51 +0100)
> >
> > are available in the Git repository at:
> >
> > git://github.com/ehabkost/qemu.git tags/python-next-pull-request
> >
> > for you to fetch changes up to c7883412440905b41dde7e70f4af782932e80e90:
> >
> > python: Remove scripts/ordereddict.py (2018-06-08 16:40:54 -0300)
> >
> > ----------------------------------------------------------------
> > Python queue, 2018-06-11
> >
> > * Make code compatible with Python 3 using 'futurize --stage1'
> > * Require Python >= 2.7 and remove Python 2.6 compatibility
> > modules
> >
> > ----------------------------------------------------------------
>
> Hi; I noticed that running configure on my machine can now produce a
> python traceback from docker.py:
>
> make: Entering directory '/home/petmay01/linaro/qemu-for-merges/build/alldbg'
> config-host.mak is out-of-date, running configure
> Traceback (most recent call last):
> File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py",
> line 29, in <module>
> from StringIO import StringIO
> ImportError: No module named 'StringIO'
> Install prefix /usr/local
> [etc]
>
> I don't know if this is because of this change, but this is the
> most recent change involving python...
This seems to be introduced by:
commit 51a12b51fd3693a16eb73362713a98d467e15af7
Author: Alex Bennée <alex.bennee@linaro.org>
Date: Wed Apr 4 14:24:39 2018 +0100
configure: add test for docker availability
This tests for a working docker installation without sudo and sets up
config-host.mak accordingly. This will be useful from cross compiling
things in the future.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
tests/docker/docker.py is still python2-only but ./configure is
trying to run it using $python (which can be Python 3).
--
Eduardo
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11
2018-06-19 12:05 ` Eduardo Habkost
@ 2018-06-19 12:13 ` Peter Maydell
0 siblings, 0 replies; 19+ messages in thread
From: Peter Maydell @ 2018-06-19 12:13 UTC (permalink / raw)
To: Eduardo Habkost
Cc: QEMU Developers, Cleber Rosa, Alex Bennée, Fam Zheng,
Philippe Mathieu-Daudé
On 19 June 2018 at 13:05, Eduardo Habkost <ehabkost@redhat.com> wrote:
> On Tue, Jun 19, 2018 at 12:13:41PM +0100, Peter Maydell wrote:
>> Hi; I noticed that running configure on my machine can now produce a
>> python traceback from docker.py:
>>
>> make: Entering directory '/home/petmay01/linaro/qemu-for-merges/build/alldbg'
>> config-host.mak is out-of-date, running configure
>> Traceback (most recent call last):
>> File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py",
>> line 29, in <module>
>> from StringIO import StringIO
>> ImportError: No module named 'StringIO'
>> Install prefix /usr/local
>> [etc]
>>
>> I don't know if this is because of this change, but this is the
>> most recent change involving python...
>
> This seems to be introduced by:
>
> commit 51a12b51fd3693a16eb73362713a98d467e15af7
> Author: Alex Bennée <alex.bennee@linaro.org>
> Date: Wed Apr 4 14:24:39 2018 +0100
>
> configure: add test for docker availability
>
> This tests for a working docker installation without sudo and sets up
> config-host.mak accordingly. This will be useful from cross compiling
> things in the future.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>
> tests/docker/docker.py is still python2-only but ./configure is
> trying to run it using $python (which can be Python 3).
Aha, yes -- I'd forgotten, but this config in my buildtest setup
is indeed configuring with --python=python3.
thanks
-- PMM
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2018-06-19 12:13 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-11 17:42 [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11 Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 01/13] python: futurize -f libfuturize.fixes.fix_print_with_import Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 02/13] python: futurize -f libfuturize.fixes.fix_absolute_import Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 03/13] python: futurize -f libfuturize.fixes.fix_next_call Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 04/13] python: futurize -f lib2to3.fixes.fix_has_key Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 05/13] python: futurize -f lib2to3.fixes.fix_standarderror Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 06/13] python: futurize -f lib2to3.fixes.fix_reduce Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 07/13] python: futurize -f lib2to3.fixes.fix_tuple_params Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 08/13] python: futurize -f lib2to3.fixes.fix_renames Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 09/13] python: futurize -f lib2to3.fixes.fix_except Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 10/13] python: futurize -f lib2to3.fixes.fix_numliterals Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 11/13] configure: Require Python 2.7 or newer Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 12/13] python: Remove scripts/argparse.py Eduardo Habkost
2018-06-11 17:42 ` [Qemu-devel] [PULL 13/13] python: Remove scripts/ordereddict.py Eduardo Habkost
2018-06-11 18:36 ` [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11 no-reply
2018-06-12 11:42 ` Peter Maydell
2018-06-19 11:13 ` Peter Maydell
2018-06-19 12:05 ` Eduardo Habkost
2018-06-19 12:13 ` Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).