[PULL,08/15] qmp.py: Avoid "has_key" usage

Message ID	20170915233739.26860-9-ehabkost@redhat.com
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 461DA85540 From: Eduardo Habkost <ehabkost@redhat.com> To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org Date: Fri, 15 Sep 2017 20:37:32 -0300 Message-Id: <20170915233739.26860-9-ehabkost@redhat.com> In-Reply-To: <20170915233739.26860-1-ehabkost@redhat.com> References: <20170915233739.26860-1-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 08/15] qmp.py: Avoid "has_key" usage Precedence: list Cc: =?utf-8?b?THVrw6HFoSBEb2t0b3I=?= <ldoktor@redhat.com>, Amador Pahim <apahim@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	[PULL,01/15] qemu.py: Pylint/style fixes \| expand [PULL,01/15] qemu.py: Pylint/style fixes [PULL,02/15] qemu\|qtest: Avoid dangerous arguments [PULL,03/15] qemu.py: Use iteritems rather than keys() [PULL,04/15] qemu.py: Simplify QMP key-conversion [PULL,05/15] qemu.py: Use custom exceptions rather than Exception [PULL,06/15] qmp.py: Couple of pylint/style fixes [PULL,07/15] qmp.py: Use object-based class for QEMUMonitorProtocol [PULL,08/15] qmp.py: Avoid "has_key" usage [PULL,09/15] qmp.py: Avoid overriding a builtin object [PULL,10/15] qtest.py: Few pylint/style fixes [PULL,11/15] qemu.py: fix is_running() return before first launch() [PULL,12/15] qemu.py: avoid writing to stdout/stderr [PULL,13/15] qemu.py: use os.path.null instead of /dev/null [PULL,14/15] qemu.py: improve message on negative exit code [PULL,15/15] qemu.py: include debug information on launch error

Message ID

20170915233739.26860-9-ehabkost@redhat.com

State

New

Headers

DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 461DA85540
From: Eduardo Habkost <ehabkost@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>,
	qemu-devel@nongnu.org
Date: Fri, 15 Sep 2017 20:37:32 -0300
Message-Id: <20170915233739.26860-9-ehabkost@redhat.com>
In-Reply-To: <20170915233739.26860-1-ehabkost@redhat.com>
References: <20170915233739.26860-1-ehabkost@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: [Qemu-devel] [PULL 08/15] qmp.py: Avoid "has_key" usage
Precedence: list
Cc: =?utf-8?b?THVrw6HFoSBEb2t0b3I=?= <ldoktor@redhat.com>,
	Amador Pahim <apahim@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>
Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org
Sender: "Qemu-devel"
	<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>

Series

[PULL,01/15] qemu.py: Pylint/style fixes | expand

Commit Message

Eduardo Habkost Sept. 15, 2017, 11:37 p.m. UTC

From: Lukáš Doktor <ldoktor@redhat.com>

The "has_key" is deprecated in favor of "__in__" operator.

Signed-off-by: Lukáš Doktor <ldoktor@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20170818142613.32394-9-ldoktor@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 scripts/qmp/qmp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/qmp/qmp.py b/scripts/qmp/qmp.py
index 95ff5cc39a..f2f5a9b296 100644
--- a/scripts/qmp/qmp.py
+++ b/scripts/qmp/qmp.py
@@ -197,7 +197,7 @@  class QEMUMonitorProtocol(object):
         Build and send a QMP command to the monitor, report errors if any
         """
         ret = self.cmd(cmd, kwds)
-        if ret.has_key('error'):
+        if "error" in ret:
             raise Exception(ret['error']['desc'])
         return ret['return']

[PULL,08/15] qmp.py: Avoid "has_key" usage

Commit Message

Patch