From 687a78242ee8e4a69df641f7922401bfcecf3a1b Mon Sep 17 00:00:00 2001
From: Valerij Maljulin <vmaljuli@redhat.com>
Date: Feb 25 2019 15:56:30 +0000
Subject: Change xmlrpclib importing way


Signed-off-by: Valerij Maljulin <vmaljuli@redhat.com>

---

diff --git a/module_build_service/builder/KojiModuleBuilder.py b/module_build_service/builder/KojiModuleBuilder.py
index 8d8f569..3419a53 100644
--- a/module_build_service/builder/KojiModuleBuilder.py
+++ b/module_build_service/builder/KojiModuleBuilder.py
@@ -35,11 +35,7 @@ import random
 import string
 import kobo.rpmlib
 import threading
-try:
-    import xmlrpclib
-except ImportError:
-    import xmlrpc.client as xmlrpclib
-
+import six.moves.xmlrpc_client as xmlrpclib
 import munch
 from itertools import chain
 from OpenSSL.SSL import SysCallError
diff --git a/module_build_service/scheduler/handlers/modules.py b/module_build_service/scheduler/handlers/modules.py
index 2c52bc8..7235e81 100644
--- a/module_build_service/scheduler/handlers/modules.py
+++ b/module_build_service/scheduler/handlers/modules.py
@@ -41,11 +41,7 @@ from requests.exceptions import ConnectionError
 from module_build_service.utils import to_text_type
 
 import koji
-try:
-    import xmlrpclib
-except ImportError:
-    import xmlrpc.client as xmlrpclib
-
+import six.moves.xmlrpc_client as xmlrpclib
 import logging
 import os
 import time
diff --git a/tests/test_builder/test_koji.py b/tests/test_builder/test_koji.py
index 49569b0..b149cd2 100644
--- a/tests/test_builder/test_koji.py
+++ b/tests/test_builder/test_koji.py
@@ -26,10 +26,7 @@ import tempfile
 import mock
 import koji
 
-try:
-    import xmlrpclib
-except ImportError:
-    import xmlrpc.client as xmlrpclib
+import six.moves.xmlrpc_client as xmlrpclib
 from collections import OrderedDict
 from module_build_service.utils import to_text_type