summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Vassalotti <alexandre@peadrop.com>2008-05-15 00:33:57 +0000
committerAlexandre Vassalotti <alexandre@peadrop.com>2008-05-15 00:33:57 +0000
commit7663f9e4ffbba27c22698283ebf8891ca5ae2ae5 (patch)
treee98e3fba9d0c292c4f46930df7920749ce5768ff
parentc92fef9a3ee7481596a18eaff3e12270f4355e2f (diff)
downloadcpython-git-7663f9e4ffbba27c22698283ebf8891ca5ae2ae5.tar.gz
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.
-rw-r--r--Lib/distutils/command/upload.py2
-rw-r--r--Lib/distutils/config.py2
-rw-r--r--Lib/distutils/dist.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
index ecc06f05ec..daf681128d 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 e9ba40260c..cf547698a9 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 e4ab3363d8..0b13c1e6c1 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()