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 ecc06f0..daf6811 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 e9ba402..cf54769 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 e4ab336..0b13c1e 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()