Fix setup_requires/tests_require/etc. not using setup.cfg or other

config files for option defaults.

--HG--
branch : setuptools
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4042684

1 files changed, 11 insertions, 11 deletions

diff --git a/setuptools/dist.py b/setuptools/dist.py
index d906eb72..06e7a71a 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -263,28 +263,28 @@ class Distribution(_Distribution):
             cmd = self._egg_fetcher
         except AttributeError:
             from setuptools.command.easy_install import easy_install
+            dist = self.__class__({'script_args':['easy_install']})
+            dist.parse_config_files()
+            opts = dist.get_option_dict('easy_install')
+            keep = (
+                'find_links', 'site_dirs', 'index_url', 'optimize',
+                'site_dirs', 'allow_hosts'
+            )
+            for key in opts.keys():
+                if key not in keep:
+                    del opts[key]   # don't use any other settings
             cmd = easy_install(
-                self.__class__({'script_args':['easy_install']}),
-                args="x", install_dir=os.curdir, exclude_scripts=True,
+                dist, args=["x"], install_dir=os.curdir, exclude_scripts=True,
                 always_copy=False, build_directory=None, editable=False,
                 upgrade=False, multi_version=True
             )
             cmd.ensure_finalized()
-            cmd.zip_ok = None       # override any setup.cfg setting for these
-            cmd.build_directory = None
             self._egg_fetcher = cmd
 
         return cmd.easy_install(req)
 
 
 
-
-
-
-
-
-
-
     def _set_global_opts_from_features(self):
         """Add --with-X/--without-X options based on optional features"""