summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorAlexandre Vassalotti <alexandre@peadrop.com>2008-05-12 01:37:10 (GMT)
committerAlexandre Vassalotti <alexandre@peadrop.com>2008-05-12 01:37:10 (GMT)
commitfb9ce65a91d674b1a80174c70a025aee83783388 (patch)
tree36913a12179421b3cf2ce9b1d709e2a7e150d19c /Lib
parented02e51ab2ca94d83a4b400c7186a51047bf3a29 (diff)
downloadcpython-fb9ce65a91d674b1a80174c70a025aee83783388.zip
cpython-fb9ce65a91d674b1a80174c70a025aee83783388.tar.gz
cpython-fb9ce65a91d674b1a80174c70a025aee83783388.tar.bz2
Renamed SocketServer to 'socketserver'.
Deprecated old name.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/lib-old/SocketServer.py8
-rw-r--r--Lib/socketserver.py (renamed from Lib/SocketServer.py)0
-rw-r--r--Lib/test/test_py3kwarn.py3
3 files changed, 10 insertions, 1 deletions
diff --git a/Lib/lib-old/SocketServer.py b/Lib/lib-old/SocketServer.py
new file mode 100644
index 0000000..9875894
--- /dev/null
+++ b/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
diff --git a/Lib/SocketServer.py b/Lib/socketserver.py
index 2c41fbb..2c41fbb 100644
--- a/Lib/SocketServer.py
+++ b/Lib/socketserver.py
diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index a4c24d4..ef4d0b9 100644
--- a/Lib/test/test_py3kwarn.py
+++ b/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: