aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/dist.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-12-14 10:47:11 -0500
committerJason R. Coombs <jaraco@jaraco.com>2016-12-14 10:47:11 -0500
commite066c97f828ec5ab8be4dde6e340dbfdcd312ec0 (patch)
treee61319da68cd1f280d38bbe2bef1b1600618f2e8 /setuptools/dist.py
parent5c5d40c367a1d32fdb0379e5961abd659f67a01f (diff)
downloadexternal_python_setuptools-e066c97f828ec5ab8be4dde6e340dbfdcd312ec0.tar.gz
external_python_setuptools-e066c97f828ec5ab8be4dde6e340dbfdcd312ec0.tar.bz2
external_python_setuptools-e066c97f828ec5ab8be4dde6e340dbfdcd312ec0.zip
Backport config file parsing behavior from Python 3.7. Ref #889.
Diffstat (limited to 'setuptools/dist.py')
-rw-r--r--setuptools/dist.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/setuptools/dist.py b/setuptools/dist.py
index c04e6426..159464be 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -21,6 +21,7 @@ from setuptools import windows_support
from setuptools.monkey import get_unpatched
from setuptools.config import parse_configuration
import pkg_resources
+from .py36compat import Distribution_parse_config_files
def _get_unpatched(cls):
@@ -213,7 +214,7 @@ def check_packages(dist, attr, value):
_Distribution = get_unpatched(distutils.core.Distribution)
-class Distribution(_Distribution):
+class Distribution(Distribution_parse_config_files, _Distribution):
"""Distribution with support for features, tests, and package data
This is an enhanced version of 'distutils.dist.Distribution' that