diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-09-29 21:14:51 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-09-29 21:14:51 -0400 |
| commit | 626fa69fb0470710e870628afd0cb7ec0ba96ddf (patch) | |
| tree | befcacc09c560133266eb5a1757a45ea43d93453 /setuptools/dist.py | |
| parent | 96aed21b42121acde68dd6b3732c3fbae0903569 (diff) | |
| parent | 9e7f35fec4178dea678693cb768b6076d45e7ddd (diff) | |
| download | external_python_setuptools-626fa69fb0470710e870628afd0cb7ec0ba96ddf.tar.gz external_python_setuptools-626fa69fb0470710e870628afd0cb7ec0ba96ddf.tar.bz2 external_python_setuptools-626fa69fb0470710e870628afd0cb7ec0ba96ddf.zip | |
Merge with 6.0.2
--HG--
branch : feature/issue-229
Diffstat (limited to 'setuptools/dist.py')
| -rw-r--r-- | setuptools/dist.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/setuptools/dist.py b/setuptools/dist.py index c6ac1946..26c35c4c 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -260,7 +260,7 @@ class Distribution(_Distribution): self.dependency_links = attrs.pop('dependency_links', []) assert_string_list(self,'dependency_links',self.dependency_links) if attrs and 'setup_requires' in attrs: - self.fetch_build_eggs(attrs.pop('setup_requires')) + self.fetch_build_eggs(attrs['setup_requires']) for ep in pkg_resources.iter_entry_points('distutils.setup_keywords'): if not hasattr(self,ep.name): setattr(self,ep.name,None) |