aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/command/easy_install.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-05-03 10:45:40 -0400
committerJason R. Coombs <jaraco@jaraco.com>2013-05-03 10:45:40 -0400
commiteafde2c8f2870bbe61084c73783b71a3329cafa0 (patch)
treed18fccee95c6099ef3df902d4fe2c701acab842e /setuptools/command/easy_install.py
parentf86079e4b6629d75a4650be64bdcbe89724138a8 (diff)
downloadexternal_python_setuptools-eafde2c8f2870bbe61084c73783b71a3329cafa0.tar.gz
external_python_setuptools-eafde2c8f2870bbe61084c73783b71a3329cafa0.tar.bz2
external_python_setuptools-eafde2c8f2870bbe61084c73783b71a3329cafa0.zip
easy_install once again honors setup.cfg if found in the current directory
--HG-- branch : Setuptools-Distribute merge extra : source : 422fc7e84eb2a22aa13df44dea6f138d7c840e83
Diffstat (limited to 'setuptools/command/easy_install.py')
-rwxr-xr-xsetuptools/command/easy_install.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 655478b3..47c1a3d8 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1925,12 +1925,6 @@ usage: %(script)s [options] requirement_or_url ...
def _show_help(self,*args,**kw):
with_ei_usage(lambda: Distribution._show_help(self,*args,**kw))
- def find_config_files(self):
- files = Distribution.find_config_files(self)
- if 'setup.cfg' in files:
- files.remove('setup.cfg')
- return files
-
if argv is None:
argv = sys.argv[1:]