python: futurize -f lib2to3.fixes.fix_has_key

Change "dict.has_key(key)" to "key in dict"

This is necessary for Python 3 compatibility.

Done using:

  $ py=$( (g grep -l -E '^#!.*python';find -name '*.py' -printf '%P\n';) | \
    sort -u | grep -v README.sh4)
  $ futurize -w -f lib2to3.fixes.fix_has_key $py

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180608122952.2009-5-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Eduardo Habkost
2018-06-08 14:39:24 -03:00
parent d24d523c14
commit d7a4228ebb
10 changed files with 12 additions and 12 deletions
+2 -2
View File
@@ -36,7 +36,7 @@ def main(args):
path = None
# Use QMP_PATH if it's set
if os.environ.has_key('QMP_PATH'):
if 'QMP_PATH' in os.environ:
path = os.environ['QMP_PATH']
while len(args):
@@ -80,7 +80,7 @@ def main(args):
def do_command(srv, cmd, **kwds):
rsp = srv.cmd(cmd, kwds)
if rsp.has_key('error'):
if 'error' in rsp:
raise Exception(rsp['error']['desc'])
return rsp['return']
+1 -1
View File
@@ -134,7 +134,7 @@ class QMPShell(qmp.QEMUMonitorProtocol):
def _fill_completion(self):
cmds = self.cmd('query-commands')
if cmds.has_key('error'):
if 'error' in cmds:
return
for cmd in cmds['return']:
self._completer.append(cmd['name'])
+1 -1
View File
@@ -29,7 +29,7 @@ class QOMFS(Fuse):
self.ino_count = 1
def get_ino(self, path):
if self.ino_map.has_key(path):
if path in self.ino_map:
return self.ino_map[path]
self.ino_map[path] = self.ino_count
self.ino_count += 1
+1 -1
View File
@@ -45,7 +45,7 @@ if len(args) > 0:
args = args[2:]
if not socket_path:
if os.environ.has_key('QMP_SOCKET'):
if 'QMP_SOCKET' in os.environ:
socket_path = os.environ['QMP_SOCKET']
else:
usage_error("no QMP socket path or address given");
+1 -1
View File
@@ -45,7 +45,7 @@ if len(args) > 0:
args = args[2:]
if not socket_path:
if os.environ.has_key('QMP_SOCKET'):
if 'QMP_SOCKET' in os.environ:
socket_path = os.environ['QMP_SOCKET']
else:
usage_error("no QMP socket path or address given");
+1 -1
View File
@@ -46,7 +46,7 @@ if len(args) > 0:
args = args[2:]
if not socket_path:
if os.environ.has_key('QMP_SOCKET'):
if 'QMP_SOCKET' in os.environ:
socket_path = os.environ['QMP_SOCKET']
else:
usage_error("no QMP socket path or address given");
+1 -1
View File
@@ -47,7 +47,7 @@ if len(args) > 0:
args = args[2:]
if not socket_path:
if os.environ.has_key('QMP_SOCKET'):
if 'QMP_SOCKET' in os.environ:
socket_path = os.environ['QMP_SOCKET']
else:
usage_error("no QMP socket path or address given");