Slight modernization.

freddrake · freddrake · commit 71cc46e7e11b · 2002-04-03T21:47:47.000Z
diff --git a/Demo/xmlrpc/xmlrpc_handler.py b/Demo/xmlrpc/xmlrpc_handler.py
@@ -12,8 +12,6 @@
 import http_server
 import xmlrpclib
 
-import regex
-import string
 import sys
 
 class xmlrpc_handler:
@@ -43,7 +41,7 @@ def continue_request (self, data, request):
             except:
                 # report exception back to server
                 response = xmlrpclib.dumps (
-                    xmlrpclib.Fault (1, "%s:%s" % (sys.exc_type, sys.exc_value))
+                    xmlrpclib.Fault (1, "%s:%s" % sys.exc_info()[:2])
                     )
             else:
                 response = xmlrpclib.dumps (response, methodresponse=1)
@@ -76,7 +74,7 @@ def __init__ (self, handler, request):
         if not cl:
             request.error (411)
         else:
-            cl = string.atoi (cl)
+            cl = int (cl)
             # using a 'numeric' terminator
             self.request.channel.set_terminator (cl)
 
diff --git a/Demo/xmlrpc/xmlrpcserver.py b/Demo/xmlrpc/xmlrpcserver.py
@@ -42,7 +42,7 @@ def do_POST(self):
             except:
                 # report exception back to server
                 response = xmlrpclib.dumps(
-                    xmlrpclib.Fault(1, "%s:%s" % (sys.exc_type, sys.exc_value))
+                    xmlrpclib.Fault(1, "%s:%s" % sys.exc_info()[:2])
                     )
             else:
                 response = xmlrpclib.dumps(

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ def do_POST(self):`
`42`	`42`	`except:`
`43`	`43`	`# report exception back to server`
`44`	`44`	`response = xmlrpclib.dumps(`
`45`		`- xmlrpclib.Fault(1, "%s:%s" % (sys.exc_type, sys.exc_value))`
	`45`	`+ xmlrpclib.Fault(1, "%s:%s" % sys.exc_info()[:2])`
`46`	`46`	`)`
`47`	`47`	`else:`
`48`	`48`	`response = xmlrpclib.dumps(`