Fixed import of configparser in the distutils module.
If configparser is unavailable, try to import configparser using its
old name. This is required for backward-compatibility with older
Python versions.
diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
index daf6811..92c4bf2 100644
--- a/Lib/distutils/command/upload.py
+++ b/Lib/distutils/command/upload.py
@@ -10,11 +10,16 @@
import os
import socket
import platform
-import ConfigParser
import httplib
import base64
import urlparse
import cStringIO as StringIO
+try:
+ from configparser import ConfigParser
+except ImportError:
+ # For backward-compatibility with Python versions < 2.6.
+ from ConfigParser import ConfigParser
+
class upload(PyPIRCCommand):
diff --git a/Lib/distutils/config.py b/Lib/distutils/config.py
index f1117be..35a21ec 100644
--- a/Lib/distutils/config.py
+++ b/Lib/distutils/config.py
@@ -5,7 +5,11 @@
"""
import os
import sys
-from ConfigParser import ConfigParser
+try:
+ from configparser import ConfigParser
+except ImportError:
+ # For backward-compatibility with Python versions < 2.6.
+ from ConfigParser import ConfigParser
from distutils.cmd import Command
diff --git a/Lib/distutils/dist.py b/Lib/distutils/dist.py
index 0b13c1e..6299919 100644
--- a/Lib/distutils/dist.py
+++ b/Lib/distutils/dist.py
@@ -358,8 +358,11 @@
def parse_config_files (self, filenames=None):
-
- from ConfigParser import ConfigParser
+ try:
+ from configparser import ConfigParser
+ except ImportError:
+ # For backward-compatibility with Python versions < 2.6.
+ from ConfigParser import ConfigParser
if filenames is None:
filenames = self.find_config_files()