mirror of https://github.com/python/cpython.git
Changed to use the new 'grok_environment_error()' function instead of
muddling through IOError and OSError exception objects right here.
This commit is contained in:
parent
e905513be0
commit
cf0e2dde6d
|
@ -112,16 +112,7 @@ class found in 'cmdclass' is used in place of the default, which is
|
|||
except KeyboardInterrupt:
|
||||
raise SystemExit, "interrupted"
|
||||
except (IOError, os.error), exc:
|
||||
# check for Python 1.5.2-style {IO,OS}Error exception objects
|
||||
if hasattr (exc, 'filename') and hasattr (exc, 'strerror'):
|
||||
if exc.filename:
|
||||
error = "error: %s: %s" % (exc.filename, exc.strerror)
|
||||
else:
|
||||
# two-argument functions in posix module don't
|
||||
# include the filename in the exception object!
|
||||
error = "error: %s" % exc.strerror
|
||||
else:
|
||||
error = "error: " + str(exc[-1])
|
||||
error = grok_environment_error(exc)
|
||||
|
||||
if DEBUG:
|
||||
sys.stderr.write(error + "\n")
|
||||
|
|
Loading…
Reference in New Issue