From: Peter Maydell <peter.maydell@linaro.org>
Date: Sat, 23 Jun 2018 20:04:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=518d23a976b7dad77cfef3e41c3531ac89229b00;p=qmiga%2Fqemu.git

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

518d23a976b7dad77cfef3e41c3531ac89229b00