diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2017-01-07 13:37:37 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2017-01-07 13:37:37 -0500 |
| commit | a0d35d47761a8bd7394cb9f2738169b07be3a005 (patch) | |
| tree | 375334a5e61eb137b5411f92942b510f6024cea3 /setuptools/command/sdist.py | |
| parent | bbf6ac250a05fd51aa2a44ed3196837491bc9d60 (diff) | |
| parent | 3c182f9f1eea89040fbfc88d1ccbed31ece6a00b (diff) | |
| download | python-setuptools-git-issue-97.tar.gz | |
Merge branch 'master' into issue-97issue-97
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: |