Commit 8b891e18 authored by Georg Brandl's avatar Georg Brandl

Fix more exception slicing.

parent 2f672dbe
...@@ -139,7 +139,7 @@ def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0, ...@@ -139,7 +139,7 @@ def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0,
macostools.copy(src, dst, 0, preserve_times) macostools.copy(src, dst, 0, preserve_times)
except os.error as exc: except os.error as exc:
raise DistutilsFileError( raise DistutilsFileError(
"could not copy '%s' to '%s': %s" % (src, dst, exc[-1])) "could not copy '%s' to '%s': %s" % (src, dst, exc.args[-1]))
# If linking (hard or symbolic), use the appropriate system call # If linking (hard or symbolic), use the appropriate system call
# (Unix only, of course, but that's the caller's responsibility) # (Unix only, of course, but that's the caller's responsibility)
......
...@@ -67,7 +67,7 @@ def _spawn_nt(cmd, search_path=1, verbose=0, dry_run=0): ...@@ -67,7 +67,7 @@ def _spawn_nt(cmd, search_path=1, verbose=0, dry_run=0):
except OSError as exc: except OSError as exc:
# this seems to happen when the command isn't found # this seems to happen when the command isn't found
raise DistutilsExecError( raise DistutilsExecError(
"command '%s' failed: %s" % (cmd[0], exc[-1])) "command '%s' failed: %s" % (cmd[0], exc.args[-1]))
if rc != 0: if rc != 0:
# and this reflects the command running but failing # and this reflects the command running but failing
raise DistutilsExecError( raise DistutilsExecError(
...@@ -88,7 +88,7 @@ def _spawn_os2(cmd, search_path=1, verbose=0, dry_run=0): ...@@ -88,7 +88,7 @@ def _spawn_os2(cmd, search_path=1, verbose=0, dry_run=0):
except OSError as exc: except OSError as exc:
# this seems to happen when the command isn't found # this seems to happen when the command isn't found
raise DistutilsExecError( raise DistutilsExecError(
"command '%s' failed: %s" % (cmd[0], exc[-1])) "command '%s' failed: %s" % (cmd[0], exc.args[-1]))
if rc != 0: if rc != 0:
# and this reflects the command running but failing # and this reflects the command running but failing
print("command '%s' failed with exit status %d" % (cmd[0], rc)) print("command '%s' failed with exit status %d" % (cmd[0], rc))
...@@ -124,7 +124,7 @@ def _spawn_posix(cmd, search_path=1, verbose=0, dry_run=0): ...@@ -124,7 +124,7 @@ def _spawn_posix(cmd, search_path=1, verbose=0, dry_run=0):
if exc.errno == errno.EINTR: if exc.errno == errno.EINTR:
continue continue
raise DistutilsExecError( raise DistutilsExecError(
"command '%s' failed: %s" % (cmd[0], exc[-1])) "command '%s' failed: %s" % (cmd[0], exc.args[-1]))
if os.WIFSIGNALED(status): if os.WIFSIGNALED(status):
raise DistutilsExecError( raise DistutilsExecError(
"command '%s' terminated by signal %d" "command '%s' terminated by signal %d"
......
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