mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Fixed import of configparser in the distutils module.

Browse source 
If configparser is unavailable, try to import configparser using its
old name. This is required for backward-compatibility with older
Python versions.
This commit is contained in:
Alexandre Vassalotti 2008-05-16 02:06:59 +00:00
parent fa40bbf625
commit eb8cef2664
3 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/distutils/command/upload.py
View file

@ -10,11 +10,16 @@ from hashlib import md5
import os import os
import socket import socket
import platform import platform
import ConfigParser
import httplib import httplib
import base64 import base64
import urlparse import urlparse
import cStringIO as StringIO 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): class upload(PyPIRCCommand):

6
Lib/distutils/config.py
View file

@ -5,7 +5,11 @@ that uses .pypirc in the distutils.command package.
""" """
import os import os
import sys 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 from distutils.cmd import Command

7
Lib/distutils/dist.py
View file

@ -358,8 +358,11 @@ Common commands: (see '--help-commands' for more)
def parse_config_files (self, filenames=None): def parse_config_files (self, filenames=None):
try:
from ConfigParser import ConfigParser from configparser import ConfigParser
except ImportError:
# For backward-compatibility with Python versions < 2.6.
from ConfigParser import ConfigParser
if filenames is None: if filenames is None:
filenames = self.find_config_files() filenames = self.find_config_files()