Commit 84e706db authored by Fred Drake's avatar Fred Drake

Slight modernization.

parent 75f696a3
...@@ -12,8 +12,6 @@ ...@@ -12,8 +12,6 @@
import http_server import http_server
import xmlrpclib import xmlrpclib
import regex
import string
import sys import sys
class xmlrpc_handler: class xmlrpc_handler:
...@@ -43,7 +41,7 @@ class xmlrpc_handler: ...@@ -43,7 +41,7 @@ class xmlrpc_handler:
except: except:
# report exception back to server # report exception back to server
response = xmlrpclib.dumps ( response = xmlrpclib.dumps (
xmlrpclib.Fault (1, "%s:%s" % (sys.exc_type, sys.exc_value)) xmlrpclib.Fault (1, "%s:%s" % sys.exc_info()[:2])
) )
else: else:
response = xmlrpclib.dumps (response, methodresponse=1) response = xmlrpclib.dumps (response, methodresponse=1)
...@@ -76,7 +74,7 @@ class collector: ...@@ -76,7 +74,7 @@ class collector:
if not cl: if not cl:
request.error (411) request.error (411)
else: else:
cl = string.atoi (cl) cl = int (cl)
# using a 'numeric' terminator # using a 'numeric' terminator
self.request.channel.set_terminator (cl) self.request.channel.set_terminator (cl)
......
...@@ -42,7 +42,7 @@ class RequestHandler(BaseHTTPServer.BaseHTTPRequestHandler): ...@@ -42,7 +42,7 @@ class RequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
except: except:
# report exception back to server # report exception back to server
response = xmlrpclib.dumps( response = xmlrpclib.dumps(
xmlrpclib.Fault(1, "%s:%s" % (sys.exc_type, sys.exc_value)) xmlrpclib.Fault(1, "%s:%s" % sys.exc_info()[:2])
) )
else: else:
response = xmlrpclib.dumps( response = xmlrpclib.dumps(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment