Kaydet (Commit) cf0e2dde authored tarafından Greg Ward's avatar Greg Ward

Changed to use the new 'grok_environment_error()' function instead of

muddling through IOError and OSError exception objects right here.
üst e905513b
......@@ -112,16 +112,7 @@ def setup (**attrs):
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")
......
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