@@ -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']
@@ -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'])
@@ -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
@@ -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");
@@ -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");
@@ -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");
@@ -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");
@@ -237,7 +237,7 @@ class ThrottleTestGroupNames(iotests.QMPTestCase):
if name:
self.assertEqual(info["group"], name)
else:
- self.assertFalse(info.has_key('group'))
+ self.assertFalse('group' in info)
return
raise Exception("No group information found for '%s'" % device)
@@ -53,9 +53,9 @@ class TestLiveSnapshot(iotests.QMPTestCase):
self.assertEqual(r['iops'], self.iops)
self.assertEqual(r['iops_size'], self.iops_size)
else:
- self.assertFalse(r.has_key('group'))
+ self.assertFalse('group' in r)
self.assertEqual(r['iops'], 0)
- self.assertFalse(r.has_key('iops_size'))
+ self.assertFalse('iops_size' in r)
def testSnapshot(self):
self.checkConfig('base')
@@ -203,7 +203,7 @@ sector = "%d"
if (self.accounted_ops(read = True, write = True, flush = True) != 0):
self.assertLess(0, stats['idle_time_ns'])
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
self.assertEqual(0, stats['rd_merged'])