diff options
author | Peter Maydell | 2018-06-23 22:04:53 +0200 |
---|---|---|
committer | Peter Maydell | 2018-06-23 22:04:53 +0200 |
commit | 518d23a976b7dad77cfef3e41c3531ac89229b00 (patch) | |
tree | 1e46fe91e074b9c05fb5445e2703dee86b0fc1cc /scripts/qmp/qemu-ga-client | |
parent | tcg: fix --disable-tcg build breakage (diff) | |
parent | Partially revert "python: futurize -f libfuturize.fixes.fix_absolute_import" (diff) | |
download | qemu-518d23a976b7dad77cfef3e41c3531ac89229b00.tar.gz qemu-518d23a976b7dad77cfef3e41c3531ac89229b00.tar.xz qemu-518d23a976b7dad77cfef3e41c3531ac89229b00.zip |
Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into staging
Python queue, 2018-06-22
* Partially revert commit that broke qmp-shell and other scripts
inside ./scripts/qmp
# gpg: Signature made Fri 22 Jun 2018 19:47:23 BST
# gpg: using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/python-next-pull-request:
Partially revert "python: futurize -f libfuturize.fixes.fix_absolute_import"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/qmp/qemu-ga-client')
-rwxr-xr-x | scripts/qmp/qemu-ga-client | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/qmp/qemu-ga-client b/scripts/qmp/qemu-ga-client index 976e69e05f..e8cb7646a0 100755 --- a/scripts/qmp/qemu-ga-client +++ b/scripts/qmp/qemu-ga-client @@ -37,11 +37,10 @@ # from __future__ import print_function -from __future__ import absolute_import import base64 import random -from . import qmp +import qmp class QemuGuestAgent(qmp.QEMUMonitorProtocol): |