diff options
| author | Peter Maydell | 2019-07-04 12:40:50 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-07-04 12:40:50 +0200 |
| commit | 3eb98f760e54f897a7ecf88e63f9eade6b00f614 (patch) | |
| tree | d5d775e5a2f07dffc52c716db75d0e609e642269 /scripts | |
| parent | Merge remote-tracking branch 'remotes/palmer/tags/riscv-for-master-4.1-sf1-v3... (diff) | |
| parent | Deprecate Python 2 support (diff) | |
| download | qemu-3eb98f760e54f897a7ecf88e63f9eade6b00f614.tar.gz qemu-3eb98f760e54f897a7ecf88e63f9eade6b00f614.tar.xz qemu-3eb98f760e54f897a7ecf88e63f9eade6b00f614.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into staging
Python queue, 2019-07-01
* Deprecate Python 2 support (Eduardo Habkost)
* qemu/__init__.py refactor (John Snow)
* make qmp-shell work with python3 (Igor Mammedov)
# gpg: Signature made Mon 01 Jul 2019 23:28:27 BST
# gpg: using RSA key 5A322FD5ABC4D3DBACCFD1AA2807936F984DC5A6
# gpg: issuer "ehabkost@redhat.com"
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/python-next-pull-request:
Deprecate Python 2 support
machine.py: minor delinting
python/qemu: split QEMUMachine out from underneath __init__.py
qmp: make qmp-shell work with python3
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/device-crash-test | 2 | ||||
| -rwxr-xr-x | scripts/qmp/qmp-shell | 5 | ||||
| -rwxr-xr-x | scripts/render_block_graph.py | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/scripts/device-crash-test b/scripts/device-crash-test index a6748910ad..15f213a6cd 100755 --- a/scripts/device-crash-test +++ b/scripts/device-crash-test @@ -36,7 +36,7 @@ import argparse from itertools import chain sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'python')) -from qemu import QEMUMachine +from qemu.machine import QEMUMachine logger = logging.getLogger('device-crash-test') dbg = logger.debug diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell index 7776c7b141..f1cddeafbc 100755 --- a/scripts/qmp/qmp-shell +++ b/scripts/qmp/qmp-shell @@ -78,6 +78,9 @@ import re sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python')) from qemu import qmp +if sys.version_info[0] == 2: + input = raw_input + class QMPCompleter(list): def complete(self, text, state): for cmd in self: @@ -308,7 +311,7 @@ class QMPShell(qmp.QEMUMonitorProtocol): @return True if execution was ok, return False if disconnected. """ try: - cmdline = raw_input(prompt) + cmdline = input(prompt) except EOFError: print() return False diff --git a/scripts/render_block_graph.py b/scripts/render_block_graph.py index 3e9d282a49..656f0388ad 100755 --- a/scripts/render_block_graph.py +++ b/scripts/render_block_graph.py @@ -25,7 +25,7 @@ import json from graphviz import Digraph sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'python')) -from qemu import MonitorResponseError +from qemu.machine import MonitorResponseError def perm(arr): |