[Python-checkins] r56321 - sandbox/branches/setuptools-0.6/setuptools/__init__.py

[phillip.eby]

Author: phillip.eby
Date: Thu Jul 12 19:32:02 2007
New Revision: 56321

Modified:
   sandbox/branches/setuptools-0.6/setuptools/__init__.py
Log:
Backport findall() fix fix from trunk.


Modified: sandbox/branches/setuptools-0.6/setuptools/__init__.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/__init__.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/__init__.py	Thu Jul 12 19:32:02 2007
@@ -69,7 +69,9 @@
     """
     all_files = []
     for base, dirs, files in os.walk(dir):
-        if base!=os.curdir:
+        if base==os.curdir or base.startswith(os.curdir+os.sep):
+            base = base[2:]
+        if base:
             files = [os.path.join(base, f) for f in files]
         all_files.extend(filter(os.path.isfile, files))
     return all_files