diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-09-06 22:58:47 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-09-06 22:58:47 -0400 |
| commit | 32a47417750420524e1270cc5e3fc749eb9e5a89 (patch) | |
| tree | 07eb71d3a1f53685a2c4c04577e49f5462eb4f8a | |
| parent | 34d2c5a13852c7e668df91b1fde4ad8465897f29 (diff) | |
| download | external_python_setuptools-32a47417750420524e1270cc5e3fc749eb9e5a89.tar.gz external_python_setuptools-32a47417750420524e1270cc5e3fc749eb9e5a89.tar.bz2 external_python_setuptools-32a47417750420524e1270cc5e3fc749eb9e5a89.zip | |
Restore old behavior for calculating the base. Fixes failing test and fixes #425.
| -rw-r--r-- | setuptools/__init__.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/setuptools/__init__.py b/setuptools/__init__.py index e9390336..49002619 100644 --- a/setuptools/__init__.py +++ b/setuptools/__init__.py @@ -145,7 +145,9 @@ def findall(dir=os.curdir): Unless dir is '.', return full filenames with dir prepended. """ def _prepend(base): - return functools.partial(os.path.join, os.path.relpath(base, dir)) + if base == os.curdir or base.startswith(os.curdir + os.sep): + base = base[2:] + return functools.partial(os.path.join, base) return [ file |