diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-12-01 11:23:45 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-12-01 11:23:45 -0500 |
| commit | 5cfce47ddb304fc95660c1086f3230fc8fdead61 (patch) | |
| tree | 34f45171a9d0459fd85b04d9af323115194af80f /setuptools/command | |
| parent | 7924b1ff5eb7b11299cb8fa469e1b74c13d86f3e (diff) | |
| download | external_python_setuptools-5cfce47ddb304fc95660c1086f3230fc8fdead61.tar.gz external_python_setuptools-5cfce47ddb304fc95660c1086f3230fc8fdead61.tar.bz2 external_python_setuptools-5cfce47ddb304fc95660c1086f3230fc8fdead61.zip | |
Use super to resolve the superclass, but fall back to direct access on Python 2 where old style classes are used. Ref #843.
Diffstat (limited to 'setuptools/command')
| -rwxr-xr-x | setuptools/command/sdist.py | 5 |
1 files changed, 4 insertions, 1 deletions
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") |