Commit cd6f8d58 authored by Jason R. Coombs's avatar Jason R. Coombs

Collapse common behavior

parent e1bc6caa
......@@ -163,8 +163,8 @@ def use_setuptools(
# a suitable version is already installed
return
except pkg_resources.DistributionNotFound:
# no version of setuptools was found
return _do_download(version, download_base, to_dir, download_delay)
# no version of setuptools was found; allow download
pass
except pkg_resources.VersionConflict as VC_err:
if imported:
# setuptools was imported prior to invocation of this function,
......@@ -177,7 +177,8 @@ def use_setuptools(
# take precedence.
del pkg_resources
_unload_pkg_resources()
return _do_download(version, download_base, to_dir, download_delay)
return _do_download(version, download_base, to_dir, download_delay)
def _unload_pkg_resources():
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment