[Python-checkins] r63347 - in python/trunk/Lib/distutils: command/upload.py config.py dist.py

[alexandre.vassalotti]

Author: alexandre.vassalotti
Date: Fri May 16 04:06:59 2008
New Revision: 63347

Log:
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.


Modified:
   python/trunk/Lib/distutils/command/upload.py
   python/trunk/Lib/distutils/config.py
   python/trunk/Lib/distutils/dist.py

Modified: python/trunk/Lib/distutils/command/upload.py
==============================================================================
--- python/trunk/Lib/distutils/command/upload.py	(original)
+++ python/trunk/Lib/distutils/command/upload.py	Fri May 16 04:06:59 2008
@@ -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):
 

Modified: python/trunk/Lib/distutils/config.py
==============================================================================
--- python/trunk/Lib/distutils/config.py	(original)
+++ python/trunk/Lib/distutils/config.py	Fri May 16 04:06:59 2008
@@ -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
 

Modified: python/trunk/Lib/distutils/dist.py
==============================================================================
--- python/trunk/Lib/distutils/dist.py	(original)
+++ python/trunk/Lib/distutils/dist.py	Fri May 16 04:06:59 2008
@@ -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()