diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-12-11 15:20:32 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-12-11 15:32:28 -0500 |
| commit | 3dd506f01d48b98aeea9bdbca0105d4c7d8ad538 (patch) | |
| tree | 07b3933bd8651b7ac184736f2a3463a483e4e7b5 /setuptools/command/sdist.py | |
| parent | 2268fb9887cfea2e28e156bd2c8314132261402f (diff) | |
| parent | 5c9406987aacf17d9c004aa1456797e0044306e5 (diff) | |
| download | python-setuptools-git-develop-nspkg-always.tar.gz | |
Merge branch 'master' into develop-nspkg-alwaysdevelop-nspkg-always
Diffstat (limited to 'setuptools/command/sdist.py')
| -rwxr-xr-x | setuptools/command/sdist.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py index 9975753d..84e29a1b 100755 --- a/setuptools/command/sdist.py +++ b/setuptools/command/sdist.py @@ -142,9 +142,13 @@ class sdist(sdist_add_defaults, orig.sdist): for filename in filenames]) def _add_defaults_data_files(self): - """ - Don't add any data files, but why? - """ + try: + if six.PY2: + sdist_add_defaults._add_defaults_data_files(self) + else: + super()._add_defaults_data_files() + except TypeError: + log.warn("data_files contains unexpected objects") def check_readme(self): for f in self.READMES: |