From e3a23c0734a8a6d4417e869c20e501771dab8a81 Mon Sep 17 00:00:00 2001
From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Wed, 14 May 2008 22:07:07 +0000
Subject: [PATCH] Renamed the ConfigParser module to 'configparser'.

---
 Lib/{ConfigParser.py => configparser.py} | 0
 Lib/lib-old/ConfigParser.py              | 8 ++++++++
 Lib/test/test_py3kwarn.py                | 3 ++-
 Misc/NEWS                                | 3 +++
 4 files changed, 13 insertions(+), 1 deletion(-)
 rename Lib/{ConfigParser.py => configparser.py} (100%)
 create mode 100644 Lib/lib-old/ConfigParser.py

diff --git a/Lib/ConfigParser.py b/Lib/configparser.py
similarity index 100%
rename from Lib/ConfigParser.py
rename to Lib/configparser.py
diff --git a/Lib/lib-old/ConfigParser.py b/Lib/lib-old/ConfigParser.py
new file mode 100644
index 00000000000..b686cc49032
--- /dev/null
+++ b/Lib/lib-old/ConfigParser.py
@@ -0,0 +1,8 @@
+import sys
+from warnings import warnpy3k
+
+warnpy3k("the ConfigParser module has been renamed "
+         "to 'configparser' in Python 3.0", stacklevel=2)
+
+import configparser
+sys.modules[__name__] = configparser
diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index 78dd53d8577..e62228425a6 100644
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -203,7 +203,8 @@ class TestStdlibRemovals(unittest.TestCase):
 class TestStdlibRenames(unittest.TestCase):
 
     renames = {'copy_reg': 'copyreg', 'Queue': 'queue',
-               'SocketServer': 'socketserver'}
+               'SocketServer': 'socketserver',
+               'ConfigParser': 'configparser'}
 
     def check_rename(self, module_name, new_module_name):
         """Make sure that:
diff --git a/Misc/NEWS b/Misc/NEWS
index 71d34cdc75b..ebcaedab26b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,9 @@ Extension Modules
 Library
 -------
 
+- The ConfigParser module has been renamed 'configparser'.  The old
+  name is now deprecated.
+
 - The CL, CL_old, and cl modules for IRIX have been deprecated for removal in
   Python 3.0.