Revert distutils changes done in r63248.

As explained by Marc-Andre Lemburg, distutils needs to stay
backward-compatible. Therefore, it should use the old ConfigParser
module name.

diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
index ecc06f05ec4741b5acc15ecc8cbdb4d27caa5a7e..daf681128d74278a2e82360ff8a573c5ed621c90 100644 (file)
--- a/Lib/distutils/command/upload.py
+++ b/Lib/distutils/command/upload.py
@@ -10,7 +10,7 @@ from hashlib import md5
 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 e9ba40260cafda26526798f0fa8ce5a7ee0e31d1..cf547698a90f231a95447e419f4d4aaba1afb6ff 100644 (file)
--- a/Lib/distutils/config.py
+++ b/Lib/distutils/config.py
@@ -5,7 +5,7 @@ that uses .pypirc in the distutils.command package.
 """
 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 e4ab3363d877f1883c51a6435142c720e3721a94..0b13c1e6c19261f540960f5368eb87891d2d261c 100644 (file)
--- a/Lib/distutils/dist.py
+++ b/Lib/distutils/dist.py
@@ -359,7 +359,7 @@ Common commands: (see '--help-commands' for more)
 
     def parse_config_files (self, filenames=None):
 
-        from configparser import ConfigParser
+        from ConfigParser import ConfigParser
 
         if filenames is None:
             filenames = self.find_config_files()