summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2007-12-08 18:38:20 (GMT)
committerChristian Heimes <christian@cheimes.de>2007-12-08 18:38:20 (GMT)
commit0aa93cda79936564e960da85a1ad806c55e580f9 (patch)
tree706ffe70b084ad9c95b477489a7fbf8d7920fb55
parent9bbac5065e09bc559581205a2b0da60b15803040 (diff)
downloadcpython-0aa93cda79936564e960da85a1ad806c55e580f9.zip
cpython-0aa93cda79936564e960da85a1ad806c55e580f9.tar.gz
cpython-0aa93cda79936564e960da85a1ad806c55e580f9.tar.bz2
Fixed two of the three failing xml rpc tests
-rw-r--r--Lib/SimpleXMLRPCServer.py2
-rw-r--r--Lib/test/test_xmlrpc.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/SimpleXMLRPCServer.py b/Lib/SimpleXMLRPCServer.py
index f74ca54..5736258 100644
--- 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 f614c76..6f78d95 100644
--- 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