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

Use modern syntax for exception handling in ez_setup.py. This change will also...

Use modern syntax for exception handling in ez_setup.py. This change will also prevent Python 2.4 and Python 2.5 users from invoking it.
parent ba268e83
...@@ -135,7 +135,7 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL, ...@@ -135,7 +135,7 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
return return
except pkg_resources.DistributionNotFound: except pkg_resources.DistributionNotFound:
return _do_download(version, download_base, to_dir, download_delay) return _do_download(version, download_base, to_dir, download_delay)
except pkg_resources.VersionConflict: except pkg_resources.VersionConflict as VC_err:
if was_imported: if was_imported:
msg = textwrap.dedent(""" msg = textwrap.dedent("""
The required version of setuptools (>={version}) is not available, The required version of setuptools (>={version}) is not available,
...@@ -144,7 +144,7 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL, ...@@ -144,7 +144,7 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
'easy_install -U setuptools'. 'easy_install -U setuptools'.
(Currently using {VC_err.args[0]!r}) (Currently using {VC_err.args[0]!r})
""").format(VC_err = sys.exc_info()[1], version=version) """).format(VC_err=VC_err, version=version)
sys.stderr.write(msg) sys.stderr.write(msg)
sys.exit(2) sys.exit(2)
...@@ -325,8 +325,7 @@ def _extractall(self, path=".", members=None): ...@@ -325,8 +325,7 @@ def _extractall(self, path=".", members=None):
self.chown(tarinfo, dirpath) self.chown(tarinfo, dirpath)
self.utime(tarinfo, dirpath) self.utime(tarinfo, dirpath)
self.chmod(tarinfo, dirpath) self.chmod(tarinfo, dirpath)
except ExtractError: except ExtractError as e:
e = sys.exc_info()[1]
if self.errorlevel > 1: if self.errorlevel > 1:
raise raise
else: else:
......
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