Merge branch 'master' into issue-97issue-97

1 files changed, 12 insertions, 1 deletions

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 8058ee7c..60cf6d9d 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -19,7 +19,9 @@ from pkg_resources.extern import packaging
 from setuptools.depends import Require
 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):
@@ -220,7 +222,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
@@ -350,6 +352,15 @@ class Distribution(_Distribution):
         if getattr(self, 'python_requires', None):
             self.metadata.python_requires = self.python_requires
 
+    def parse_config_files(self, filenames=None):
+        """Parses configuration files from various levels
+        and loads configuration.
+
+        """
+        _Distribution.parse_config_files(self, filenames=filenames)
+
+        parse_configuration(self, self.command_options)
+
     def parse_command_line(self):
         """Process features after parsing command line options"""
         result = _Distribution.parse_command_line(self)