Remove TimeoutError workaround for Python 2

Author: Mab879

tests/ssg_test_suite/oscap.py

@@ -6,9 +6,6 @@
 import logging
 import os.path
 import re
-import socket
-import subprocess
-import sys
 import time
 import xml.etree.ElementTree
 
@@ -20,12 +17,6 @@
 
 from ssg.shims import input_func
 
-# Needed for compatibility as there is no TimeoutError in python2.
-if sys.version_info[0] < 3:
-    TimeoutException = socket.timeout
-else:
-    TimeoutException = TimeoutError
-
 logging.getLogger(__name__).addHandler(logging.NullHandler())
 
 _CONTEXT_RETURN_CODES = {'pass': 0,
@@ -684,7 +675,7 @@ def test_target(self):
             logging.info("Terminating the test run due to keyboard interrupt.")
         except RuntimeError as exc:
             logging.error("Terminating due to error: {msg}.".format(msg=str(exc)))
-        except TimeoutException as exc:
+        except TimeoutError as exc:
             logging.error("Terminating due to timeout: {msg}".format(msg=str(exc)))
         finally:
             self.finalize()

tests/ssg_test_suite/virt.py

@@ -2,18 +2,11 @@
 
 import logging
 import socket
-import sys
 import time
 import xml.etree.ElementTree as ET
 
 import libvirt
 
-# Needed for compatibility as there is no TimeoutError in python2.
-if sys.version_info[0] < 3:
-    TimeoutException = socket.timeout
-else:
-    TimeoutException = TimeoutError
-
 logging.getLogger(__name__).addHandler(logging.NullHandler())
 
 
@@ -201,7 +194,7 @@ def reboot_domain(domain, domain_ip, ssh_port):
                 str_err = ("Timeout reached: '{0}' ({1}:{2}) domain does not "
                            "accept connections.".format(domain.name(), domain_ip, ssh_port))
                 logging.debug(str_err)
-                raise TimeoutException(str_err)
+                raise TimeoutError(str_err)
         else:
             ssh_socket.close()
             break