From 6c1d2e637adee3676ae621b2106df84284478085 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Aug 25 2017 20:48:02 +0000
Subject: use python six to get xmlrpc_client in unit tests


---

diff --git a/tests/test_lib/test_xmlrpcplus.py b/tests/test_lib/test_xmlrpcplus.py
index dd21290..867a9ad 100644
--- a/tests/test_lib/test_xmlrpcplus.py
+++ b/tests/test_lib/test_xmlrpcplus.py
@@ -1,6 +1,6 @@
 import unittest
 
-import xmlrpclib
+from six.moves import xmlrpc_client
 from koji import xmlrpcplus
 
 
@@ -24,9 +24,9 @@ class TestDump(unittest.TestCase):
         for value in self.standard_data:
             value = (value, "other arg")
             enc = xmlrpcplus.dumps(value, methodname=method)
-            _enc = xmlrpclib.dumps(value, methodname=method, allow_none=1)
+            _enc = xmlrpc_client.dumps(value, methodname=method, allow_none=1)
             self.assertEqual(enc, _enc)
-            params, method = xmlrpclib.loads(enc)
+            params, method = xmlrpc_client.loads(enc)
             self.assertEqual(params, value)
             self.assertEqual(method, method)
 
@@ -34,21 +34,21 @@ class TestDump(unittest.TestCase):
         for value in self.standard_data:
             value = (value,)
             enc = xmlrpcplus.dumps(value, methodresponse=1)
-            _enc = xmlrpclib.dumps(value, methodresponse=1, allow_none=1)
+            _enc = xmlrpc_client.dumps(value, methodresponse=1, allow_none=1)
             self.assertEqual(enc, _enc)
-            params, method = xmlrpclib.loads(enc)
+            params, method = xmlrpc_client.loads(enc)
             self.assertEqual(params, value)
             self.assertEqual(method, None)
 
     def test_just_data(self):
-        # xmlrpclib supports this case, so I guess we should too
+        # xmlrpc_client supports this case, so I guess we should too
         # neither method call nor response
         for value in self.standard_data:
             value = (value, "foo", "bar")
             enc = xmlrpcplus.dumps(value)
-            _enc = xmlrpclib.dumps(value, allow_none=1)
+            _enc = xmlrpc_client.dumps(value, allow_none=1)
             self.assertEqual(enc, _enc)
-            params, method = xmlrpclib.loads(enc)
+            params, method = xmlrpc_client.loads(enc)
             self.assertEqual(params, value)
             self.assertEqual(method, None)
 
@@ -59,7 +59,7 @@ class TestDump(unittest.TestCase):
     def test_generator(self):
         value = (self.gendata(),)
         enc = xmlrpcplus.dumps(value, methodresponse=1)
-        params, method = xmlrpclib.loads(enc)
+        params, method = xmlrpc_client.loads(enc)
         expect = (list(self.gendata()),)
         self.assertEqual(params, expect)
         self.assertEqual(method, None)
@@ -75,14 +75,14 @@ class TestDump(unittest.TestCase):
         for value in self.long_data:
             value = (value,)
             enc = xmlrpcplus.dumps(value, methodresponse=1)
-            params, method = xmlrpclib.loads(enc)
+            params, method = xmlrpc_client.loads(enc)
             self.assertEqual(params, value)
             self.assertEqual(method, None)
         # and as a call
         method = "foomethod"
         value = tuple(self.long_data)
         enc = xmlrpcplus.dumps(value, methodname=method)
-        params, method = xmlrpclib.loads(enc)
+        params, method = xmlrpc_client.loads(enc)
         self.assertEqual(params, value)
         self.assertEqual(method, method)
 
@@ -95,14 +95,14 @@ class TestDump(unittest.TestCase):
         code = 1001
         msg = "some useless error"
         f1 = xmlrpcplus.Fault(code, msg)
-        f2 = xmlrpclib.Fault(code, msg)
+        f2 = xmlrpc_client.Fault(code, msg)
         value = f1
         enc = xmlrpcplus.dumps(value, methodresponse=1)
-        _enc = xmlrpclib.dumps(value, methodresponse=1, allow_none=1)
+        _enc = xmlrpc_client.dumps(value, methodresponse=1, allow_none=1)
         self.assertEqual(enc, _enc)
         try:
-            params, method = xmlrpclib.loads(enc)
-        except xmlrpclib.Fault, e:
+            params, method = xmlrpc_client.loads(enc)
+        except xmlrpc_client.Fault as e:
             self.assertEqual(e.faultCode, code)
             self.assertEqual(e.faultString, msg)
         else: