Merge pull request #1322 from luckyh/qemu-python3-dict-call

[qemu] Python 3: Update dict calls

qemu/tests/device_option_check.py

@@ -72,7 +72,7 @@ def run(test, params, env):
 
                 qtree_value = None
                 for node in qemu_qtree.traverse(qdev):
-                    if node.qtree.has_key(qtree_check_option):
+                    if qtree_check_option in node.qtree:
                         qtree_value = str(node.qtree.get(qtree_check_option))
                         break
 

qemu/tests/kill_app.py

@@ -32,7 +32,7 @@ def run(test, params, env):
     else:
         for vm in vms:
             logging.debug("vm %s", vm)
-            if params.has_key(vm):
+            if vm in params:
                 kill_app(vm, app_name, params, env)
 
 

qemu/tests/multi_disk.py

@@ -202,7 +202,7 @@ def run(test, params, env):
         if not has_name:
             params["image_name_%s" % name] = stg_image_name % name
             param_table[-1].append(params.get("image_name_%s" % name))
-        for parm in param_matrix.iteritems():
+        for parm in param_matrix.items():
             params['%s_%s' % (parm[0], name)] = str(parm[1][i % len(parm[1])])
             param_table[-1].append(params.get('%s_%s' % (parm[0], name)))
 

qemu/tests/multi_disk_random_hotplug.py

@@ -65,7 +65,7 @@ def convert_params(params, args):
     params['images'] += " %s" % name
     params['image_name_%s' % name] = args.pop('filename')
     params['image_raw_device_%s' % name] = 'yes'
-    for key, value in args.iteritems():
+    for key, value in args.items():
         params["%s_%s" % (convert.get(key, key), name)] = value
     return params
 
@@ -163,7 +163,7 @@ def run(test, params, env):
             else:
                 args['fmt'] = fmt
             # Other params
-            for key, value in param_matrix.iteritems():
+            for key, value in param_matrix.items():
                 args[key] = random.choice(value)
 
             try:

qemu/tests/pci_devices.py

@@ -107,11 +107,11 @@ def verify_qdev_vs_qtree(qdev_info, qtree_info):
     qtree_devices, qtree_devices_noid = qtree_info[:2]
 
     errors = ""
-    for dev_id, device in qtree_devices.iteritems():
+    for dev_id, device in qtree_devices.items():
         if dev_id not in qdev_devices:
             errors += "Device %s is in qtree but not in qdev.\n" % dev_id
             continue
-        for key, value in device.iteritems():
+        for key, value in device.items():
             err = ""
             if qdev_devices[dev_id][key] != value:
                 err += "  %s != %s\n" % (qdev_devices[dev_id][key], value)

qemu/tests/usb_common.py

@@ -22,7 +22,7 @@ def parse_usb_topology(params):
     usb_topology = json.loads(params["usb_topology"],
                               object_pairs_hook=OrderedDict)
     parsed_devs = []
-    for key, value in usb_topology.iteritems():
+    for key, value in usb_topology.items():
         for i in xrange(value):
             params["usb_devices"] += " d%s" % len(parsed_devs)
             usb_type = '{"usb_type_d%s": "%s"}' % (len(parsed_devs), key)

qemu/tests/usb_storage.py

@@ -94,7 +94,7 @@ def run(test, params, env):
         if vm.is_alive():
             vm.destroy()
 
-        for option, value in options.iteritems():
+        for option, value in options.items():
             params[option] = value
         error_context.context("Restarting VM")
         vm.create(params=params)