Issue 4005: Remove .sort() call on dict_keys object.

avassalotti · avassalotti · commit 515a74fbf9c5 · 2009-07-05T06:42:44.000Z
This caused pydoc to fail when there was a zip file in sys.path.

Patch contributed by Amaury Forgeot d'Arc.
diff --git a/Lib/pkgutil.py b/Lib/pkgutil.py
@@ -318,8 +318,7 @@ def get_filename(self, fullname=None):
     from zipimport import zipimporter
 
     def iter_zipimport_modules(importer, prefix=''):
-        dirlist = zipimport._zip_directory_cache[importer.archive].keys()
-        dirlist.sort()
+        dirlist = sorted(zipimport._zip_directory_cache[importer.archive])
         _prefix = importer.prefix
         plen = len(_prefix)
         yielded = {}
diff --git a/Lib/test/test_pkgutil.py b/Lib/test/test_pkgutil.py
@@ -74,6 +74,12 @@ def test_getdata_zipfile(self):
         self.assertEqual(res1, RESOURCE_DATA)
         res2 = pkgutil.get_data(pkg, 'sub/res.txt')
         self.assertEqual(res2, RESOURCE_DATA)
+
+        names = []
+        for loader, name, ispkg in pkgutil.iter_modules([zip_file]):
+            names.append(name)
+        self.assertEqual(names, ['test_getdata_zipfile'])
+
         del sys.path[0]
 
         del sys.modules[pkg]
