Merge pull request #1331 from luckyh/qemu-python3-module-name

[qemu] Python 3: Update module name

qemu/tests/performance.py

@@ -4,7 +4,10 @@ import commands
 import shutil
 import shelve
 import threading
-from Queue import Queue
+try:
+    from queue import Queue
+except ImportError:
+    from Queue import Queue
 
 from avocado.utils import download
 from avocado.utils import process

qemu/tests/qemu_io_blkdebug.py

 import os
 import re
 import logging
-import ConfigParser
+try:
+    from configparser import ConfigParser
+except ImportError:
+    from ConfigParser import ConfigParser
 
 from avocado.utils import process
 
@@ -50,7 +53,7 @@ def run(test, params, env):
     image_name, _ = image_io.create(params.object_params(image))
 
     template_name = utils_misc.get_path(test.virtdir, blkdebug_default)
-    template = ConfigParser.ConfigParser()
+    template = ConfigParser()
     template.read(template_name)
 
     for errn in errn_list:

qemu/tests/unittest.py

@@ -2,7 +2,10 @@ import logging
 import os
 import shutil
 import glob
-import ConfigParser
+try:
+    from configparser import ConfigParser
+except ImportError:
+    from ConfigParser import ConfigParser
 
 from virttest import utils_misc
 from virttest import env_process
@@ -32,7 +35,7 @@ def run(test, params, env):
     logging.debug('Flat file list: %s', unittest_list)
 
     unittest_cfg = os.path.join(unittest_dir, 'unittests.cfg')
-    parser = ConfigParser.ConfigParser()
+    parser = ConfigParser()
     parser.read(unittest_cfg)
     test_list = parser.sections()