mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Use OESeeror instead of os.error (#16720)

Browse source 
Patch by Serhiy Storchaka.
This commit is contained in:
Andrew Svetlov 2012-12-24 19:58:48 +02:00
parent 6a7a49c631
commit 8b33dd8e54
21 changed files with 56 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Tools/scripts/byext.py
View file

@ -25,7 +25,7 @@ class Stats:
self.addstats("<dir>", "dirs", 1)
try:
names = os.listdir(dir)
except os.error as err:
except OSError as err:
sys.stderr.write("Can't list %s: %s\n" % (dir, err))
self.addstats("<dir>", "unlistable", 1)
return

2
Tools/scripts/byteyears.py
View file

@ -43,7 +43,7 @@ def main():
for filename in sys.argv[1:]:
try:
st = statfunc(filename)
except os.error as msg:
except OSError as msg:
sys.stderr.write("can't stat %r: %r\n" % (filename, msg))
status = 1
st = ()

4
Tools/scripts/checkpyc.py
View file

@ -24,7 +24,7 @@ def main():
for dirname in sys.path:
try:
names = os.listdir(dirname)
except os.error:
except OSError:
print('Cannot list directory', repr(dirname))
continue
if not silent:
@ -34,7 +34,7 @@ def main():
name = os.path.join(dirname, name)
try:
st = os.stat(name)
except os.error:
except OSError:
print('Cannot stat', repr(name))
continue
if verbose:

4
Tools/scripts/copytime.py
View file

@ -13,12 +13,12 @@ def main():
file1, file2 = sys.argv[1], sys.argv[2]
try:
stat1 = os.stat(file1)
except os.error:
except OSError:
sys.stderr.write(file1 + ': cannot stat\n')
sys.exit(1)
try:
os.utime(file2, (stat1[ST_ATIME], stat1[ST_MTIME]))
except os.error:
except OSError:
sys.stderr.write(file2 + ': cannot change time\n')
sys.exit(2)

2
Tools/scripts/finddiv.py
View file

@ -70,7 +70,7 @@ def process(filename, listnames):
def processdir(dir, listnames):
try:
names = os.listdir(dir)
except os.error as msg:
except OSError as msg:
sys.stderr.write("Can't list directory: %s\n" % dir)
return 1
files = []

2
Tools/scripts/findlinksto.py
View file

@ -36,7 +36,7 @@ def visit(prog, dirname, names):
linkto = os.readlink(name)
if prog.search(linkto) is not None:
print(name, '->', linkto)
except os.error:
except OSError:
pass
if __name__ == '__main__':

8
Tools/scripts/fixcid.py
View file

@ -97,7 +97,7 @@ def recursedown(dirname):
bad = 0
try:
names = os.listdir(dirname)
except os.error as msg:
except OSError as msg:
err(dirname + ': cannot list directory: ' + str(msg) + '\n')
return 1
names.sort()
@ -175,17 +175,17 @@ def fix(filename):
try:
statbuf = os.stat(filename)
os.chmod(tempname, statbuf[ST_MODE] & 0o7777)
except os.error as msg:
except OSError as msg:
err(tempname + ': warning: chmod failed (' + str(msg) + ')\n')
# Then make a backup of the original file as filename~
try:
os.rename(filename, filename + '~')
except os.error as msg:
except OSError as msg:
err(filename + ': warning: backup failed (' + str(msg) + ')\n')
# Now move the temp file to the original file
try:
os.rename(tempname, filename)
except os.error as msg:
except OSError as msg:
err(filename + ': rename failed (' + str(msg) + ')\n')
return 1
# Return success

20
Tools/scripts/ftpmirror.py
View file

@ -108,7 +108,7 @@ def mirrorsubdir(f, localdir):
if verbose: print('Creating local directory', repr(localdir))
try:
makedir(localdir)
except os.error as msg:
except OSError as msg:
print("Failed to establish local directory", repr(localdir))
return
infofilename = os.path.join(localdir, '.mirrorinfo')
@ -183,7 +183,7 @@ def mirrorsubdir(f, localdir):
continue
try:
os.unlink(tempname)
except os.error:
except OSError:
pass
if mode[0] == 'l':
if verbose:
@ -218,11 +218,11 @@ def mirrorsubdir(f, localdir):
fp1.close()
try:
os.unlink(fullname)
except os.error:
except OSError:
pass # Ignore the error
try:
os.rename(tempname, fullname)
except os.error as msg:
except OSError as msg:
print("Can't rename %r to %r: %s" % (tempname, fullname, msg))
continue
info[filename] = infostuff
@ -255,7 +255,7 @@ def mirrorsubdir(f, localdir):
try:
if not localdir: names = os.listdir(os.curdir)
else: names = os.listdir(localdir)
except os.error:
except OSError:
names = []
for name in names:
if name[0] == '.' or name in info or name in subdirs:
@ -312,7 +312,7 @@ def remove(fullname):
if os.path.isdir(fullname) and not os.path.islink(fullname):
try:
names = os.listdir(fullname)
except os.error:
except OSError:
names = []
ok = 1
for name in names:
@ -322,13 +322,13 @@ def remove(fullname):
return 0
try:
os.rmdir(fullname)
except os.error as msg:
except OSError as msg:
print("Can't remove local directory %r: %s" % (fullname, msg))
return 0
else:
try:
os.unlink(fullname)
except os.error as msg:
except OSError as msg:
print("Can't remove local file %r: %s" % (fullname, msg))
return 0
return 1
@ -386,7 +386,7 @@ def writedict(dict, filename):
backup = os.path.join(dir, fname + '~')
try:
os.unlink(backup)
except os.error:
except OSError:
pass
fp = open(tempname, 'w')
fp.write('{\n')
@ -396,7 +396,7 @@ def writedict(dict, filename):
fp.close()
try:
os.rename(filename, backup)
except os.error:
except OSError:
pass
os.rename(tempname, filename)

6
Tools/scripts/linktree.py
View file

@ -32,13 +32,13 @@ def main():
return 1
try:
os.mkdir(newtree, 0o777)
except os.error as msg:
except OSError as msg:
print(newtree + ': cannot mkdir:', msg)
return 1
linkname = os.path.join(newtree, link)
try:
os.symlink(os.path.join(os.pardir, oldtree), linkname)
except os.error as msg:
except OSError as msg:
if not link_may_fail:
print(linkname + ': cannot symlink:', msg)
return 1
@ -51,7 +51,7 @@ def linknames(old, new, link):
if debug: print('linknames', (old, new, link))
try:
names = os.listdir(old)
except os.error as msg:
except OSError as msg:
print(old + ': warning: cannot listdir:', msg)
return
for name in names:

10
Tools/scripts/pathfix.py
View file

@ -73,7 +73,7 @@ def recursedown(dirname):
bad = 0
try:
names = os.listdir(dirname)
except os.error as msg:
except OSError as msg:
err('%s: cannot list directory: %r\n' % (dirname, msg))
return 1
names.sort()
@ -131,24 +131,24 @@ def fix(filename):
mtime = statbuf.st_mtime
atime = statbuf.st_atime
os.chmod(tempname, statbuf[ST_MODE] & 0o7777)
except os.error as msg:
except OSError as msg:
err('%s: warning: chmod failed (%r)\n' % (tempname, msg))
# Then make a backup of the original file as filename~
try:
os.rename(filename, filename + '~')
except os.error as msg:
except OSError as msg:
err('%s: warning: backup failed (%r)\n' % (filename, msg))
# Now move the temp file to the original file
try:
os.rename(tempname, filename)
except os.error as msg:
except OSError as msg:
err('%s: rename failed (%r)\n' % (filename, msg))
return 1
if preserve_timestamps:
if atime and mtime:
try:
os.utime(filename, (atime, mtime))
except os.error as msg:
except OSError as msg:
err('%s: reset of timestamp failed (%r)\n' % (filename, msg))
return 1
# Return succes

6
Tools/scripts/pindent.py
View file

@ -427,7 +427,7 @@ def complete_file(filename, stepsize = STEPSIZE, tabsize = TABSIZE, expandtabs =
# end if
import os
try: os.rename(filename, filename + '~')
except os.error: pass
except OSError: pass
# end try
f = open(filename, 'w')
f.write(result)
@ -442,7 +442,7 @@ def delete_file(filename, stepsize = STEPSIZE, tabsize = TABSIZE, expandtabs = E
# end if
import os
try: os.rename(filename, filename + '~')
except os.error: pass
except OSError: pass
# end try
f = open(filename, 'w')
f.write(result)
@ -457,7 +457,7 @@ def reformat_file(filename, stepsize = STEPSIZE, tabsize = TABSIZE, expandtabs =
# end if
import os
try: os.rename(filename, filename + '~')
except os.error: pass
except OSError: pass
# end try
f = open(filename, 'w')
f.write(result)

2
Tools/scripts/treesync.py
View file

@ -78,7 +78,7 @@ def process(slave, master):
print("creating slave directory", slave)
try:
os.mkdir(slave)
except os.error as msg:
except OSError as msg:
print("can't make slave directory", slave, ":", msg)
return
else:

4
Tools/scripts/untabify.py
View file

@ -39,11 +39,11 @@ def process(filename, tabsize, verbose=True):
backup = filename + "~"
try:
os.unlink(backup)
except os.error:
except OSError:
pass
try:
os.rename(filename, backup)
except os.error:
except OSError:
pass
with open(filename, "w", encoding=encoding) as f:
f.write(newtext)

2
Tools/scripts/which.py
View file

@ -29,7 +29,7 @@ def main():
filename = os.path.join(dir, prog)
try:
st = os.stat(filename)
except os.error:
except OSError:
continue
if not S_ISREG(st[ST_MODE]):
msg(filename + ': not a disk file')