Merge pull request #4193 from bskjois/removePy2Support

Removed python2 imports

deps/input_event/input_event_win.py

@@ -3,13 +3,9 @@
 import json
 import os
 import sys
+import tkinter
 from ctypes import wintypes
 
-try:
-    import Tkinter as tkinter
-except ImportError:
-    import tkinter
-
 import win32api
 import win32con
 

provider/input_event_proxy.py

@@ -1,11 +1,7 @@
 import json
 import logging
 import os
-
-try:
-    from queue import Queue
-except ImportError:
-    from Queue import Queue
+from queue import Queue
 
 from virttest import data_dir, utils_misc
 

qemu/tests/kvm_unit_test.py

@@ -1,11 +1,7 @@
 import glob
 import os
 import shutil
-
-try:
-    from configparser import ConfigParser
-except ImportError:
-    from ConfigParser import ConfigParser
+from configparser import ConfigParser
 
 from virttest import env_process, utils_misc
 

qemu/tests/performance.py

@@ -3,14 +3,9 @@
 import shelve
 import shutil
 import threading
+from queue import Queue
 
 import six
-
-try:
-    from queue import Queue
-except ImportError:
-    from Queue import Queue
-
 from avocado.utils import download, process
 from virttest import data_dir, utils_misc, utils_test
 

qemu/tests/qemu_io_blkdebug.py

@@ -1,10 +1,6 @@
 import os
 import re
-
-try:
-    from configparser import ConfigParser
-except ImportError:
-    from ConfigParser import ConfigParser
+from configparser import ConfigParser
 
 from avocado.utils import process
 from virttest import data_dir, error_context, qemu_io, utils_misc

qemu/tests/usb_common.py

@@ -1,7 +1,4 @@
-try:
-    import simplejson as json
-except ImportError:
-    import json
+import json
 import logging
 from collections import OrderedDict