diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-09-06 22:35:48 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-09-06 22:35:48 -0400 |
| commit | 3c0d3a91f64a9174f6e3473bbcea3be42045004a (patch) | |
| tree | 0427b3cd9cb8abb82a667a1ef6f1e0e2c4dbd492 | |
| parent | 9366bb0996cd7c8d3f77ee45f84ddd77f7ded8b7 (diff) | |
| download | external_python_setuptools-3c0d3a91f64a9174f6e3473bbcea3be42045004a.tar.gz external_python_setuptools-3c0d3a91f64a9174f6e3473bbcea3be42045004a.tar.bz2 external_python_setuptools-3c0d3a91f64a9174f6e3473bbcea3be42045004a.zip | |
Update docstring and test to match long-standing expectation in behavior.
| -rw-r--r-- | setuptools/__init__.py | 5 | ||||
| -rw-r--r-- | setuptools/tests/test_setuptools.py | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/setuptools/__init__.py b/setuptools/__init__.py index 2c492446..63ee15ed 100644 --- a/setuptools/__init__.py +++ b/setuptools/__init__.py @@ -137,8 +137,9 @@ class Command(_Command): distutils.core.Command = Command # we can't patch distutils.cmd, alas def findall(dir = os.curdir): - """Find all files under 'dir' and return the list of full filenames - (relative to 'dir'). + """ + Find all files under 'dir' and return the list of full filenames. + Unless dir is '.', return full filenames with dir prepended. """ all_files = [] for base, dirs, files in os.walk(dir, followlinks=True): diff --git a/setuptools/tests/test_setuptools.py b/setuptools/tests/test_setuptools.py index f6bec644..e1a06c96 100644 --- a/setuptools/tests/test_setuptools.py +++ b/setuptools/tests/test_setuptools.py @@ -14,6 +14,7 @@ def example_source(tmpdir): def test_findall(example_source): found = list(setuptools.findall(str(example_source))) expected = ['readme.txt', 'foo/bar.py'] + expected = [example_source.join(fn) for fn in expected] assert found == expected |