Index: fixes/fix_imports.py
===================================================================
--- fixes/fix_imports.py	(revision 57338)
+++ fixes/fix_imports.py	(working copy)
@@ -11,9 +11,35 @@
 from fixes import basefix
 from fixes.util import Name, attr_chain, any, set
 
-MAPPING = {"StringIO":  ("io", ["StringIO"]),
-           "cStringIO": ("io", ["StringIO"]),
-           "md5":       ("hashlib", ["md5"])}
+MAPPING = {"StringIO":          ("io", ["StringIO"]),
+           "cStringIO":         ("io", ["StringIO"]),
+           "md5":               ("hashlib", ["md5"]),
+           "BaseHTTPServer":    ("base_http_server",
+                                 ["HTTPServer", "BaseHTTPRequestHandler"]),
+           "SimpleHTTPServer":  ("simple_http_server",
+                                 ["SimpleHTTPRequestHandler"]),
+           "CGIHTTPServer":     ("cgi_http_server",
+                                 ["CGIHTTPRequestHandler"]),
+           "DocXMLRPCServer":   ("doc_xmlrpc_server",
+                                 ["DocXMLRPCServer",
+                                  "DocCGIXMLRPCRequestHandler",
+                                  "DocXMLRPCRequestHandler"]),
+           "SimpleXMLRPCServer":("simple_xmlrpc_server",
+                                 ["SimpleXMLRPCServer",
+                                  "CGIXMLRPCRequestHandler",
+                                  "SimpleXMLRPCRequestHandler"]),
+           "SocketServer":      ("socket_server",
+                                 ["TCPServer", "UDPServer",
+                                  "ForkingUDPServer","ForkingTCPServer",
+                                   "ThreadingUDPServer", "ThreadingTCPServer",
+                                   "BaseRequestHandler",
+                                   "StreamRequestHandler",
+                                   "DatagramRequestHandler", "ThreadingMixIn",
+                                   "ForkingMixIn", "UnixStreamServer",
+                                   "UnixDatagramServer", 
+                                   "ThreadingUnixStreamServer",
+                                   "ThreadingUnixDatagramServer"]),
+           }
 
 
 def alternates(members):