Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix [issue4038] py3k error in distutils file_copy exception handlers. r=martin.

This commit is contained in:
Mark Hammond 2008-10-05 09:00:28 +00:00
parent e5384b0886
commit d12dcaea3e
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Lib/distutils/file_util.py
View File

@ -30,31 +30,27 @@ def _copy_file_contents(src, dst, buffer_size=16*1024):
try:
fsrc = open(src, 'rb')
except os.error as e:
(errno, errstr) = e
raise DistutilsFileError("could not open '%s': %s" % (src, errstr))
raise DistutilsFileError("could not open '%s': %s" % (src, e.strerror))
if os.path.exists(dst):
try:
os.unlink(dst)
except os.error as e:
(errno, errstr) = e
raise DistutilsFileError(
"could not delete '%s': %s" % (dst, errstr))
"could not delete '%s': %s" % (dst, e.strerror))
try:
fdst = open(dst, 'wb')
except os.error as e:
(errno, errstr) = e
raise DistutilsFileError(
"could not create '%s': %s" % (dst, errstr))
"could not create '%s': %s" % (dst, e.strerror))
while True:
try:
buf = fsrc.read(buffer_size)
except os.error as e:
(errno, errstr) = e
raise DistutilsFileError(
"could not read from '%s': %s" % (src, errstr))
"could not read from '%s': %s" % (src, e.strerror))
if not buf:
break
@ -62,9 +58,8 @@ def _copy_file_contents(src, dst, buffer_size=16*1024):
try:
fdst.write(buf)
except os.error as e:
(errno, errstr) = e
raise DistutilsFileError(
"could not write to '%s': %s" % (dst, errstr))
"could not write to '%s': %s" % (dst, e.strerror))
finally:
if fdst:
fdst.close()