From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Thu, 15 May 2008 00:33:57 +0000 (+0000)
Subject: Revert distutils changes done in r63248.
X-Git-Tag: v2.6b1~422
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7663f9e4ffbba27c22698283ebf8891ca5ae2ae5;p=thirdparty%2FPython%2Fcpython.git

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 ecc06f05ec47..daf681128d74 100644
--- 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 e9ba40260caf..cf547698a90f 100644
--- 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 e4ab3363d877..0b13c1e6c192 100644
--- 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()