Fixed two of the three failing xml rpc tests

diff --git a/Lib/SimpleXMLRPCServer.py b/Lib/SimpleXMLRPCServer.py
index f74ca541c7a6e78c59b97320cce5d59e8ed4a537..57362586e4ba980a98b274fa8eee87f0d99e7de1 100644 (file)
--- a/Lib/SimpleXMLRPCServer.py
+++ b/Lib/SimpleXMLRPCServer.py
@@ -479,7 +479,7 @@ class SimpleXMLRPCRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
     def report_404 (self):
             # Report a 404 error
         self.send_response(404)
-        response = 'No such page'
+        response = b'No such page'
         self.send_header("Content-type", "text/plain")
         self.send_header("Content-length", str(len(response)))
         self.end_headers()

diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py
index f614c76d9da6445ddddc80afc971c8374d601380..6f78d95a3ccede04cbfd1169e519bcada7d2d0df 100644 (file)
--- a/Lib/test/test_xmlrpc.py
+++ b/Lib/test/test_xmlrpc.py
@@ -424,7 +424,7 @@ class SimpleServerTestCase(unittest.TestCase):
 
             self.assertEqual(result.results[0]['faultCode'], 1)
             self.assertEqual(result.results[0]['faultString'],
-                '<type \'exceptions.Exception\'>:method "this_is_not_exists" '
+                '<type \'Exception\'>:method "this_is_not_exists" '
                 'is not supported')
         except xmlrpclib.ProtocolError as e:
             # ignore failures due to non-blocking socket 'unavailable' errors