Updated import statements to use the new `configparser` module name.
Updated the documentation to use the new name.
Revert addition of the stub entry for the old name.
Georg, I am reverting your changes since this commit should propagate
to py3k.
diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
index daf6811..ecc06f0 100644
--- a/Lib/distutils/command/upload.py
+++ b/Lib/distutils/command/upload.py
@@ -10,7 +10,7 @@
import os
import socket
import platform
-import ConfigParser
+import configparser
import httplib
import base64
import urlparse
diff --git a/Lib/distutils/config.py b/Lib/distutils/config.py
index cf54769..e9ba402 100644
--- a/Lib/distutils/config.py
+++ b/Lib/distutils/config.py
@@ -5,7 +5,7 @@
"""
import os
import sys
-from ConfigParser import ConfigParser
+from configparser import ConfigParser
from distutils.core import Command
diff --git a/Lib/distutils/dist.py b/Lib/distutils/dist.py
index 0b13c1e..e4ab336 100644
--- a/Lib/distutils/dist.py
+++ b/Lib/distutils/dist.py
@@ -359,7 +359,7 @@
def parse_config_files (self, filenames=None):
- from ConfigParser import ConfigParser
+ from configparser import ConfigParser
if filenames is None:
filenames = self.find_config_files()