summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Holth <dholth@fastmail.fm>2013-07-20 11:16:05 -0400
committerDaniel Holth <dholth@fastmail.fm>2013-07-20 11:16:05 -0400
commit7ae828b05ccf60fe727c3ff67094b4c36a36ad47 (patch)
treee96cd8bb25164ca3096b56346ce851e33ed449ba
parent28efa26aa909ea60533c0719ed5f7aaa6adf8fb2 (diff)
parent32ce1f20d60722db8cc99eecdc4b7bf6e627730e (diff)
downloadpython-setuptools-git-7ae828b05ccf60fe727c3ff67094b4c36a36ad47.tar.gz
merge
-rw-r--r--ez_setup.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/ez_setup.py b/ez_setup.py
index 22f14f73..6b2a023b 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -100,6 +100,8 @@ def _do_download(version, download_base, to_dir, download_delay):
to_dir, download_delay)
_build_egg(egg, tarball, to_dir)
sys.path.insert(0, egg)
+ if 'pkg_resources' in sys.modules:
+ del sys.modules['pkg_resources']
import setuptools
setuptools.bootstrap_install_from = egg