summaryrefslogtreecommitdiff
path: root/Lib/SimpleXMLRPCServer.py
diff options
context:
space:
mode:
authorAlexandre Vassalotti <alexandre@peadrop.com>2008-05-12 02:31:37 +0000
committerAlexandre Vassalotti <alexandre@peadrop.com>2008-05-12 02:31:37 +0000
commitce261952e640b2d09ada1b160f0cfa37db32f928 (patch)
tree17b1c2129377435cbaf0169f702b78a61407b90f /Lib/SimpleXMLRPCServer.py
parent6f1e619b414a93084efbb7244034a3546899fa4b (diff)
downloadcpython-git-ce261952e640b2d09ada1b160f0cfa37db32f928.tar.gz
Renamed the SocketServer module to 'socketserver'.
Merged revisions 63132 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r63132 | alexandre.vassalotti | 2008-05-11 22:11:22 -0400 (Sun, 11 May 2008) | 4 lines Updated all import statements to use the new socketserver module name. Renamed socketserver module in its own documentation. Renamed documentation references. ........
Diffstat (limited to 'Lib/SimpleXMLRPCServer.py')
-rw-r--r--Lib/SimpleXMLRPCServer.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/SimpleXMLRPCServer.py b/Lib/SimpleXMLRPCServer.py
index 57362586e4..a9851535ab 100644
--- a/Lib/SimpleXMLRPCServer.py
+++ b/Lib/SimpleXMLRPCServer.py
@@ -100,7 +100,7 @@ server.handle_request()
import xmlrpclib
from xmlrpclib import Fault
-import SocketServer
+import socketserver
import BaseHTTPServer
import sys
import os
@@ -494,7 +494,7 @@ class SimpleXMLRPCRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
if self.server.logRequests:
BaseHTTPServer.BaseHTTPRequestHandler.log_request(self, code, size)
-class SimpleXMLRPCServer(SocketServer.TCPServer,
+class SimpleXMLRPCServer(socketserver.TCPServer,
SimpleXMLRPCDispatcher):
"""Simple XML-RPC server.
@@ -518,7 +518,7 @@ class SimpleXMLRPCServer(SocketServer.TCPServer,
self.logRequests = logRequests
SimpleXMLRPCDispatcher.__init__(self, allow_none, encoding)
- SocketServer.TCPServer.__init__(self, addr, requestHandler, bind_and_activate)
+ socketserver.TCPServer.__init__(self, addr, requestHandler, bind_and_activate)
# [Bug #1222790] If possible, set close-on-exec flag; if a
# method spawns a subprocess, the subprocess shouldn't have