mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged in code from the 0.1.5 release to handle IOError and OSError 

exceptions better.
This commit is contained in:
Greg Ward 2000-04-22 03:20:49 +00:00
parent 6a9a545ab1
commit d80506c238
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Lib/distutils/core.py
View File

@ -9,7 +9,7 @@
__revision__ = "$Id$" __revision__ = "$Id$"
import sys import sys, os
from types import * from types import *
from distutils.errors import * from distutils.errors import *
from distutils.dist import Distribution from distutils.dist import Distribution
@ -89,13 +89,19 @@ def setup (**attrs):
dist.run_commands () dist.run_commands ()
except KeyboardInterrupt: except KeyboardInterrupt:
raise SystemExit, "interrupted" raise SystemExit, "interrupted"
except (OSError, IOError), exc: except (IOError, os.error), exc:
# arg, try to work with Python pre-1.5.2 # check for Python 1.5.2-style {IO,OS}Error exception objects
if hasattr (exc, 'filename') and hasattr (exc, 'strerror'): if hasattr (exc, 'filename') and hasattr (exc, 'strerror'):
raise SystemExit, \ if exc.filename:
"error: %s: %s" % (exc.filename, exc.strerror) raise SystemExit, \
"error: %s: %s" % (exc.filename, exc.strerror)
else:
# two-argument functions in posix module don't
# include the filename in the exception object!
raise SystemExit, \
"error: %s" % exc.strerror
else: else:
raise SystemExit, str (exc) raise SystemExit, "error: " + exc[-1]
except (DistutilsExecError, except (DistutilsExecError,
DistutilsFileError, DistutilsFileError,
DistutilsOptionError), msg: DistutilsOptionError), msg: