summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPJ Eby <distutils-sig@python.org>2007-07-12 17:32:02 +0000
committerPJ Eby <distutils-sig@python.org>2007-07-12 17:32:02 +0000
commitab69c26ccc5d8c178f3f6d7d1c7e52ab7a47d179 (patch)
treef5555988db62c35f852454ef829c759360efac49
parent78d1ac395ddf1b633da0bd4596c18d518c509099 (diff)
downloadpython-setuptools-git-ab69c26ccc5d8c178f3f6d7d1c7e52ab7a47d179.tar.gz
Backport findall() fix fix from trunk.
--HG-- branch : setuptools-0.6 extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4056321
-rw-r--r--setuptools/__init__.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index a4f84445..983d25f2 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -69,7 +69,9 @@ def findall(dir = os.curdir):
"""
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