aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/command
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-12-01 11:12:47 -0500
committerGitHub <noreply@github.com>2016-12-01 11:12:47 -0500
commite846e067648f2f1c19b45ed0166c62dff8262f76 (patch)
treeb7c516a91bcea34173c4b004e96161684be91fef /setuptools/command
parent09f0ed4036de064e3807801668d5875a9a7e8b9d (diff)
parent11b921f2e17586e394639e7ddbcaeae727ece4d0 (diff)
downloadexternal_python_setuptools-e846e067648f2f1c19b45ed0166c62dff8262f76.tar.gz
external_python_setuptools-e846e067648f2f1c19b45ed0166c62dff8262f76.tar.bz2
external_python_setuptools-e846e067648f2f1c19b45ed0166c62dff8262f76.zip
Merge pull request #843 from tweksteen/pypi_tests
Remove _add_defaults_data_files override and add unittest
Diffstat (limited to 'setuptools/command')
-rwxr-xr-xsetuptools/command/sdist.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 9975753d..ba980622 100755
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -142,9 +142,10 @@ 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:
+ sdist_add_defaults._add_defaults_data_files(self)
+ except TypeError:
+ log.warn("data_files contains unexpected objects")
def check_readme(self):
for f in self.READMES: