Renamed SocketServer to 'socketserver'.

Deprecated old name.

Lib/lib-old/SocketServer.py

@@ -0,0 +1,8 @@
+import sys
+from warnings import warnpy3k
+
+warnpy3k("the SocketServer module has been renamed "
+         "to 'socketserver' in Python 3.0", stacklevel=2)
+
+import socketserver
+sys.modules[__name__] = socketserver

Lib/test/test_py3kwarn.py

@@ -182,7 +182,8 @@ class TestStdlibRemovals(unittest.TestCase):
 
 class TestStdlibRenames(unittest.TestCase):
 
-    renames = {'copy_reg': 'copyreg', 'Queue': 'queue'}
+    renames = {'copy_reg': 'copyreg', 'Queue': 'queue',
+               'SocketServer': 'socketserver'}
 
     def check_rename(self, module_name, new_module_name):
         """Make sure that:

Misc/NEWS

@@ -26,6 +26,9 @@ Extension Modules
 Library
 -------
 
+- The SocketServer module has been renamed 'socketserver'.  The old
+  name is now deprecated.
+
 - The imageop module has been deprecated for removal in Python 3.0.
 
 - #2250: Exceptions raised during evaluation of names in rlcompleter's