Commit 518d23a9 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f28d0dfd bf20b675

scripts/qmp/qemu-ga-client

+1 −2
Original line number Diff line number Diff line
@@ -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):

scripts/qmp/qmp

+1 −2
Original line number Diff line number Diff line
@@ -11,9 +11,8 @@ 
# 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:

scripts/qmp/qmp-shell

+1 −2
Original line number Diff line number Diff line
@@ -66,8 +66,7 @@ 
# sent to QEMU, which is useful for debugging and documentation generation.



from __future__ import print_function

from __future__ import absolute_import

from . import qmp

import qmp

import json

import ast

import readline

scripts/qmp/qom-fuse

+1 −2
Original line number Diff line number Diff line
@@ -11,12 +11,11 @@ 
# 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)

scripts/qmp/qom-get

+1 −2
Original line number Diff line number Diff line
@@ -12,10 +12,9 @@ 
##



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