diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-01-16 06:33:04 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-01-16 06:33:04 -0500 |
| commit | 0f590c0d72709128f32c23437fe0183386c69d1c (patch) | |
| tree | 485d9ef16f9f9ae960bf91637040f506a04a63ca /setuptools/command/build_py.py | |
| parent | ddfbfa731e2cf73dc03b5a3345996afac843441e (diff) | |
| download | python-setuptools-git-0f590c0d72709128f32c23437fe0183386c69d1c.tar.gz | |
Prefer relpath to string slicing for computing a path relative to a base. Fixes #341.
Diffstat (limited to 'setuptools/command/build_py.py')
| -rw-r--r-- | setuptools/command/build_py.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py index 5021bd1f..0c1026aa 100644 --- a/setuptools/command/build_py.py +++ b/setuptools/command/build_py.py @@ -84,12 +84,10 @@ class build_py(orig.build_py, Mixin2to3): # Compute package build directory build_dir = os.path.join(*([self.build_lib] + package.split('.'))) - # Length of path to strip from found files - plen = len(src_dir) + 1 - # Strip directory from globbed filenames filenames = [ - file[plen:] for file in self.find_data_files(package, src_dir) + os.path.relpath(file, src_dir) + for file in self.find_data_files(package, src_dir) ] return package, src_dir, build_dir, filenames |