Slight modernization.

diff --git a/Demo/xmlrpc/xmlrpc_handler.py b/Demo/xmlrpc/xmlrpc_handler.py
index 9fa17667c3b7ceaf23a90e3f9be1a1bb7291f5a1..193547516677d29a73260b8195f23e1deec5fd9e 100644 (file)
--- 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 @@ class xmlrpc_handler:
             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 @@ class collector:
         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
index fa30419d99d3b6b214dc0f289329df93d23d9a74..7af73bec99ab510f347e6e59005a5d3f5a2650b4 100644 (file)
--- a/Demo/xmlrpc/xmlrpcserver.py
+++ b/Demo/xmlrpc/xmlrpcserver.py
@@ -42,7 +42,7 @@ class RequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
             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(