Merge pull request #843 from tweksteen/pypi_tests

Remove _add_defaults_data_files override and add unittest

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: