diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-05-22 15:22:09 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-05-22 15:22:09 -0400 |
| commit | ba0b4d2eb91961a2237064850deca9e711ee4368 (patch) | |
| tree | 80fe95a565e37196c4d3eba0a5540b3efe1e9f45 | |
| parent | dde1bfbf9aca70f4d78c349059ba43b3d40eb0e5 (diff) | |
| download | external_python_setuptools-ba0b4d2eb91961a2237064850deca9e711ee4368.tar.gz external_python_setuptools-ba0b4d2eb91961a2237064850deca9e711ee4368.tar.bz2 external_python_setuptools-ba0b4d2eb91961a2237064850deca9e711ee4368.zip | |
Allow files to be iterable in exclude_data_files
| -rw-r--r-- | setuptools/command/build_py.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py index 4ce35314..41b2660c 100644 --- a/setuptools/command/build_py.py +++ b/setuptools/command/build_py.py @@ -106,10 +106,10 @@ class build_py(orig.build_py, Mixin2to3): # flatten the expanded globs into an iterable of matches globs_matches = itertools.chain.from_iterable(globs_expanded) glob_files = filter(os.path.isfile, globs_matches) - files = list(itertools.chain( + files = itertools.chain( self.manifest_files.get(package, []), glob_files, - )) + ) return self.exclude_data_files(package, src_dir, files) def build_package_data(self): @@ -198,6 +198,7 @@ class build_py(orig.build_py, Mixin2to3): self.exclude_package_data.get('', []), self.exclude_package_data.get(package, []), ) + files = list(files) bad = set( item for pattern in globs |