[Python-3000-checkins] r56411 - python/branches/py3k-struni/Lib/distutils/filelist.py python/branches/py3k-struni/Lib/distutils/version.py

[collin.winter]

Author: collin.winter
Date: Tue Jul 17 02:39:32 2007
New Revision: 56411

Modified:
   python/branches/py3k-struni/Lib/distutils/filelist.py
   python/branches/py3k-struni/Lib/distutils/version.py
Log:
Fix two bugs from the map->itertools.imap switch.

Modified: python/branches/py3k-struni/Lib/distutils/filelist.py
==============================================================================
--- python/branches/py3k-struni/Lib/distutils/filelist.py	(original)
+++ python/branches/py3k-struni/Lib/distutils/filelist.py	Tue Jul 17 02:39:32 2007
@@ -65,8 +65,7 @@
 
     def sort (self):
         # Not a strict lexical sort!
-        sortable_files = map(os.path.split, self.files)
-        sortable_files.sort()
+        sortable_files = sorted(map(os.path.split, self.files))
         self.files = []
         for sort_tuple in sortable_files:
             self.files.append(os.path.join(*sort_tuple))

Modified: python/branches/py3k-struni/Lib/distutils/version.py
==============================================================================
--- python/branches/py3k-struni/Lib/distutils/version.py	(original)
+++ python/branches/py3k-struni/Lib/distutils/version.py	Tue Jul 17 02:39:32 2007
@@ -306,11 +306,11 @@
         # from the parsed tuple -- so I just store the string here for
         # use by __str__
         self.vstring = vstring
-        components = filter(lambda x: x and x != '.',
-                            self.component_re.split(vstring))
-        for i in range(len(components)):
+        components = [x for x in self.component_re.split(vstring)
+                              if x and x != '.']
+        for i, obj in enumerate(components):
             try:
-                components[i] = int(components[i])
+                components[i] = int(obj)
             except ValueError:
                 pass