summaryrefslogtreecommitdiffstats
path: root/Lib/distutils
diff options
context:
space:
mode:
authorAlexandre Vassalotti <alexandre@peadrop.com>2008-05-14 22:59:42 (GMT)
committerAlexandre Vassalotti <alexandre@peadrop.com>2008-05-14 22:59:42 (GMT)
commit1d1eaa45c94a9b1dacfb9aa711c0d6ecf87cbd67 (patch)
tree345691dd348b6efc561b12d01cebe02fcbc8fe3d /Lib/distutils
parent84726faf4185244d028fe3d7eea27a05b905b145 (diff)
downloadcpython-1d1eaa45c94a9b1dacfb9aa711c0d6ecf87cbd67.zip
cpython-1d1eaa45c94a9b1dacfb9aa711c0d6ecf87cbd67.tar.gz
cpython-1d1eaa45c94a9b1dacfb9aa711c0d6ecf87cbd67.tar.bz2
Renamed ConfigParser to configparser.
Merged revisions 63247-63248 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r63247 | georg.brandl | 2008-05-14 18:30:31 -0400 (Wed, 14 May 2008) | 2 lines Update configparser docs for lowercasing rename. ........ r63248 | alexandre.vassalotti | 2008-05-14 18:44:22 -0400 (Wed, 14 May 2008) | 8 lines Updated import statements to use the new `configparser` module name. Updated the documentation to use the new name. Revert addition of the stub entry for the old name. Georg, I am reverting your changes since this commit should propagate to py3k. ........
Diffstat (limited to 'Lib/distutils')
-rw-r--r--Lib/distutils/command/upload.py2
-rw-r--r--Lib/distutils/dist.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
index 34b6692..23999ae 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/dist.py b/Lib/distutils/dist.py
index ade2ab7..847eb90 100644
--- a/Lib/distutils/dist.py
+++ b/Lib/distutils/dist.py
@@ -349,7 +349,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()