From 5cfce47ddb304fc95660c1086f3230fc8fdead61 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Thu, 1 Dec 2016 11:23:45 -0500 Subject: Use super to resolve the superclass, but fall back to direct access on Python 2 where old style classes are used. Ref #843. --- setuptools/command/sdist.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py index ba980622..84e29a1b 100755 --- a/setuptools/command/sdist.py +++ b/setuptools/command/sdist.py @@ -143,7 +143,10 @@ class sdist(sdist_add_defaults, orig.sdist): def _add_defaults_data_files(self): try: - sdist_add_defaults._add_defaults_data_files(self) + 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") -- cgit v1.2.1