david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

python: futurize -f lib2to3.fixes.fix_has_key

Browse Source 
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 09:29:46 -03:00
parent d24d523c14
commit d7a4228ebb
10 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/qmp/qmp
View File

@ -36,7 +36,7 @@ def main(args):
path = None path = None
# Use QMP_PATH if it's set # 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'] path = os.environ['QMP_PATH']
while len(args): while len(args):
@ -80,7 +80,7 @@ def main(args):
def do_command(srv, cmd, **kwds): def do_command(srv, cmd, **kwds):
rsp = srv.cmd(cmd, kwds) rsp = srv.cmd(cmd, kwds)
if rsp.has_key('error'): if 'error' in rsp:
raise Exception(rsp['error']['desc']) raise Exception(rsp['error']['desc'])
return rsp['return'] return rsp['return']

2
scripts/qmp/qmp-shell
View File

@ -134,7 +134,7 @@ class QMPShell(qmp.QEMUMonitorProtocol):
def _fill_completion(self): def _fill_completion(self):
cmds = self.cmd('query-commands') cmds = self.cmd('query-commands')
if cmds.has_key('error'): if 'error' in cmds:
return return
for cmd in cmds['return']: for cmd in cmds['return']:
self._completer.append(cmd['name']) self._completer.append(cmd['name'])

2
scripts/qmp/qom-fuse
View File

@ -29,7 +29,7 @@ class QOMFS(Fuse):
self.ino_count = 1 self.ino_count = 1
def get_ino(self, path): def get_ino(self, path):
if self.ino_map.has_key(path): if path in self.ino_map:
return self.ino_map[path] return self.ino_map[path]
self.ino_map[path] = self.ino_count self.ino_map[path] = self.ino_count
self.ino_count += 1 self.ino_count += 1

2
scripts/qmp/qom-get
View File

@ -45,7 +45,7 @@ if len(args) > 0:
args = args[2:] args = args[2:]
if not socket_path: if not socket_path:
if os.environ.has_key('QMP_SOCKET'): if 'QMP_SOCKET' in os.environ:
socket_path = os.environ['QMP_SOCKET'] socket_path = os.environ['QMP_SOCKET']
else: else:
usage_error("no QMP socket path or address given"); usage_error("no QMP socket path or address given");

2
scripts/qmp/qom-list
View File

@ -45,7 +45,7 @@ if len(args) > 0:
args = args[2:] args = args[2:]
if not socket_path: if not socket_path:
if os.environ.has_key('QMP_SOCKET'): if 'QMP_SOCKET' in os.environ:
socket_path = os.environ['QMP_SOCKET'] socket_path = os.environ['QMP_SOCKET']
else: else:
usage_error("no QMP socket path or address given"); usage_error("no QMP socket path or address given");

2
scripts/qmp/qom-set
View File

@ -46,7 +46,7 @@ if len(args) > 0:
args = args[2:] args = args[2:]
if not socket_path: if not socket_path:
if os.environ.has_key('QMP_SOCKET'): if 'QMP_SOCKET' in os.environ:
socket_path = os.environ['QMP_SOCKET'] socket_path = os.environ['QMP_SOCKET']
else: else:
usage_error("no QMP socket path or address given"); usage_error("no QMP socket path or address given");

2
scripts/qmp/qom-tree
View File

@ -47,7 +47,7 @@ if len(args) > 0:
args = args[2:] args = args[2:]
if not socket_path: if not socket_path:
if os.environ.has_key('QMP_SOCKET'): if 'QMP_SOCKET' in os.environ:
socket_path = os.environ['QMP_SOCKET'] socket_path = os.environ['QMP_SOCKET']
else: else:
usage_error("no QMP socket path or address given"); usage_error("no QMP socket path or address given");

2
tests/qemu-iotests/093
View File

@ -237,7 +237,7 @@ class ThrottleTestGroupNames(iotests.QMPTestCase):
if name: if name:
self.assertEqual(info["group"], name) self.assertEqual(info["group"], name)
else: else:
self.assertFalse(info.has_key('group')) self.assertFalse('group' in info)
return return
raise Exception("No group information found for '%s'" % device) raise Exception("No group information found for '%s'" % device)

4
tests/qemu-iotests/096
View File

@ -53,9 +53,9 @@ class TestLiveSnapshot(iotests.QMPTestCase):
self.assertEqual(r['iops'], self.iops) self.assertEqual(r['iops'], self.iops)
self.assertEqual(r['iops_size'], self.iops_size) self.assertEqual(r['iops_size'], self.iops_size)
else: else:
self.assertFalse(r.has_key('group')) self.assertFalse('group' in r)
self.assertEqual(r['iops'], 0) self.assertEqual(r['iops'], 0)
self.assertFalse(r.has_key('iops_size')) self.assertFalse('iops_size' in r)
def testSnapshot(self): def testSnapshot(self):
self.checkConfig('base') self.checkConfig('base')

2
tests/qemu-iotests/136
View File

@ -203,7 +203,7 @@ sector = "%d"
if (self.accounted_ops(read = True, write = True, flush = True) != 0): if (self.accounted_ops(read = True, write = True, flush = True) != 0):
self.assertLess(0, stats['idle_time_ns']) self.assertLess(0, stats['idle_time_ns'])
else: else:
self.assertFalse(stats.has_key('idle_time_ns')) self.assertFalse('idle_time_ns' in stats)
# This test does not alter these, so they must be all 0 # This test does not alter these, so they must be all 0
self.assertEqual(0, stats['rd_merged']) self.assertEqual(0, stats['rd_merged'])