Python queue, 2018-06-22

* Partially revert commit that broke qmp-shell and other scripts
   inside ./scripts/qmp
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJbLUQ7AAoJECgHk2+YTcWmfo4QALBgkNheCfeOMmVKN/yX7Rjd
 r6FA5SP438rx9RSdzyKym4S2KXov/Tqoxe72Akdov62ZbRMFD17I3O2NQLYpmeq8
 /dvoLURs7pSSD1qVHprgY1P1JelIZUQ5iD8sAKnMRQMV0MjvF5u5kCo2gD/GRuhb
 6MW7qIYL8SVuBo8AAbRThWM9/9IKL8VFM4q9uOWrXXntyunLvupaW4qTD6UjP9Wy
 cyv3qg11JLZ7BvW+OqRPe/+DkJOjOVMBa/LLGqNSu0oXf8pdhxyaZSbcR/pf3Qsw
 yniuRQCP+lQfwweXvnNlEd+3ikJuGk05zuuLaxDbftvo5pzdWgiPPqgGIuNT87ih
 7w3KbLe+EhGOxM1svAf/LEc0oHef7QfxnxhejwUyICVs497yR5UCKpL7V9Ots9WN
 cGFc5cC0pWAu042/etUWJXkJ0hH4ZH5MnEQUMKFys+hlfXWfhJPx+n4HTHiAYEvG
 BEcBMHL32mwCGkpprp2QscIDUPtIA2mC5P1+1yfneoeMFxbP6abd4zjSXhqwAXUl
 4Vnqa02uISrOHYPdnYzKVA8lTaRLjxGJONaH+nJ05eTz0WYvznMlSVLFpflr53WI
 nyH9gfQaXNrmQNGsNvIiDnN5pgKi3H82v0eiSDJUnRHmzd8pY5suYhI2s1CXjflX
 JQbUD3/UV2XCnIxowtgj
 =y5/Z
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2018-06-23 21:04:53 +01:00
commit 518d23a976
8 changed files with 8 additions and 16 deletions

View File

@ -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):

View File

@ -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:

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -14,10 +14,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