diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-03-05 15:18:18 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-03-05 15:18:19 +0000 |
| commit | af4378c39e54705d9b585089de80aae9526ac7e7 (patch) | |
| tree | 18c532a6f6dfb1de4ddfa0ee1300ff5ce8c5e44c /tests | |
| parent | e64a62df378a746c0b257105959613c9f8122e59 (diff) | |
| parent | 8ec0e1a4e68781f1e512af47fd6ab46ec76326e8 (diff) | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2020-03-05' into staging
QAPI patches for 2020-03-05
# gpg: Signature made Thu 05 Mar 2020 12:42:15 GMT
# gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg: issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-qapi-2020-03-05:
qapi: Brush off some (py)lint
qapi: Use super() now we have Python 3
qapi: Drop conditionals for Python 2
qapi: Inheriting from object is pointless with Python 3, drop
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/qapi-schema/test-qapi.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/qapi-schema/test-qapi.py b/tests/qapi-schema/test-qapi.py index 41232c11a3..bee18ee344 100755 --- a/tests/qapi-schema/test-qapi.py +++ b/tests/qapi-schema/test-qapi.py @@ -16,15 +16,11 @@ import argparse import difflib import os import sys +from io import StringIO from qapi.error import QAPIError from qapi.schema import QAPISchema, QAPISchemaVisitor -if sys.version_info[0] < 3: - from cStringIO import StringIO -else: - from io import StringIO - class QAPISchemaTestVisitor(QAPISchemaVisitor): |