mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-23 11:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Issue #16706: get rid of os.error

Browse source
This commit is contained in:
Andrew Svetlov 2012-12-18 22:02:39 +02:00
parent a191959849
commit ad28c7f9da
33 changed files with 4089 additions and 4123 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/distutils/file_util.py
View file

@ -27,26 +27,26 @@ def _copy_file_contents(src, dst, buffer_size=16*1024):
try:
try:
fsrc = open(src, 'rb')
except os.error as e:
except OSError as e:
raise DistutilsFileError("could not open '%s': %s" % (src, e.strerror))
if os.path.exists(dst):
try:
os.unlink(dst)
except os.error as e:
except OSError as e:
raise DistutilsFileError(
"could not delete '%s': %s" % (dst, e.strerror))
try:
fdst = open(dst, 'wb')
except os.error as e:
except OSError as e:
raise DistutilsFileError(
"could not create '%s': %s" % (dst, e.strerror))
while True:
try:
buf = fsrc.read(buffer_size)
except os.error as e:
except OSError as e:
raise DistutilsFileError(
"could not read from '%s': %s" % (src, e.strerror))
@ -55,7 +55,7 @@ def _copy_file_contents(src, dst, buffer_size=16*1024):
try:
fdst.write(buf)
except os.error as e:
except OSError as e:
raise DistutilsFileError(
"could not write to '%s': %s" % (dst, e.strerror))
finally:
@ -193,7 +193,7 @@ def move_file (src, dst,
copy_it = False
try:
os.rename(src, dst)
except os.error as e:
except OSError as e:
(num, msg) = e
if num == errno.EXDEV:
copy_it = True
@ -205,11 +205,11 @@ def move_file (src, dst,
copy_file(src, dst, verbose=verbose)
try:
os.unlink(src)
except os.error as e:
except OSError as e:
(num, msg) = e
try:
os.unlink(dst)
except os.error:
except OSError:
pass
raise DistutilsFileError(
"couldn't move '%s' to '%s' by copy/delete: "