diff options
| author | Philip Thiem <ptthiem@gmail.com> | 2013-07-20 18:10:50 -0500 |
|---|---|---|
| committer | Philip Thiem <ptthiem@gmail.com> | 2013-07-20 18:10:50 -0500 |
| commit | a6e7ef0ae1e0ea1f147a2196efe7f2b82c301fe2 (patch) | |
| tree | 8f73e0285965d86cbb6b8d8bc599789fd4a924ef /ez_setup.py | |
| parent | 37c48a4da11b40a5a8a3c801525b637bb2934df1 (diff) | |
| parent | 70067439d3b2b53cf2112ed0faf52c30b30ef3cd (diff) | |
| download | python-setuptools-git-a6e7ef0ae1e0ea1f147a2196efe7f2b82c301fe2.tar.gz | |
Merge with default
--HG--
extra : rebase_source : 15517dca4272e2b088930cb5599f5822cef13bae
Diffstat (limited to 'ez_setup.py')
| -rw-r--r-- | ez_setup.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ez_setup.py b/ez_setup.py index c225c6ae..55434eb7 100644 --- a/ez_setup.py +++ b/ez_setup.py @@ -28,7 +28,7 @@ try: except ImportError: USER_SITE = None -DEFAULT_VERSION = "0.8" +DEFAULT_VERSION = "0.9.7" DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/" def _python_cmd(*args): @@ -100,6 +100,12 @@ 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) + + # Remove previously-imported pkg_resources if present (see + # https://bitbucket.org/pypa/setuptools/pull-request/7/ for details). + if 'pkg_resources' in sys.modules: + del sys.modules['pkg_resources'] + import setuptools setuptools.bootstrap_install_from = egg |