More Python 2.5 compatibility fixes.

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4051937

pkg_resources.py

@@ -1502,13 +1502,13 @@ def get_importer(path_item):
             pass
     return importer
 
-
-
-
-
-
-
-
+try:
+    from pkgutil import get_importer, ImpImporter
+except ImportError:
+    pass    # Python 2.3 or 2.4, use our own implementation
+else:
+    ImpWrapper = ImpImporter    # Python 2.5, use pkgutil's implementation
+    del ImpLoader, ImpImporter
 
 
 

pkg_resources.txt

@@ -1665,6 +1665,10 @@ PEP 302 Utilities
     "importer" object.  This ``ImpWrapper`` is *not* cached; instead a new
     instance is returned each time.
 
+    (Note: When run under Python 2.5, this function is simply an alias for
+    ``pkgutil.get_importer()``, and instead of ``pkg_resources.ImpWrapper``
+    instances, it may return ``pkgutil.ImpImporter`` instances.)
+
 
 File/Path Utilities
 -------------------
@@ -1687,6 +1691,9 @@ File/Path Utilities
 Release Notes/Change History
 ----------------------------
 
+0.6c3
+ * Python 2.5 compatibility fixes.
+
 0.6c2
  * Fix a problem with eggs specified directly on ``PYTHONPATH`` on
    case-insensitive filesystems possibly not showing up in the default

setuptools.egg-info/entry_points.txt

@@ -28,7 +28,7 @@ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
 easy_install = setuptools.command.easy_install:main
-easy_install-2.3 = setuptools.command.easy_install:main
+easy_install-2.4 = setuptools.command.easy_install:main
 
 [distutils.commands]
 bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm