socketserver renaming reversal part 3: move the module into the right
place and fix all references to it. Closes #2926.
diff --git a/Lib/SimpleXMLRPCServer.py b/Lib/SimpleXMLRPCServer.py
index 353542a..5fad0af 100644
--- a/Lib/SimpleXMLRPCServer.py
+++ b/Lib/SimpleXMLRPCServer.py
@@ -101,7 +101,7 @@
import xmlrpclib
from xmlrpclib import Fault
-import socketserver
+import SocketServer
import BaseHTTPServer
import sys
import os
@@ -512,7 +512,7 @@
if self.server.logRequests:
BaseHTTPServer.BaseHTTPRequestHandler.log_request(self, code, size)
-class SimpleXMLRPCServer(socketserver.TCPServer,
+class SimpleXMLRPCServer(SocketServer.TCPServer,
SimpleXMLRPCDispatcher):
"""Simple XML-RPC server.
@@ -536,7 +536,7 @@
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