cpython: 6cfe2982de42 (original) (raw)

Mercurial > cpython

changeset 81017:6cfe2982de42

Use OESeeror instead of os.error (#16720) Patch by Serhiy Storchaka. [#16720]

line wrap: on

line diff

--- a/Lib/cgi.py +++ b/Lib/cgi.py @@ -950,7 +950,7 @@ def print_directory(): try: pwd = os.getcwd() except OSError as msg:

•    print("os.error:", html.escape(str(msg)))[](#l1.7)

•    print("OSError:", html.escape(str(msg)))[](#l1.8)

  else: print(html.escape(pwd)) print()

--- a/Lib/os.py +++ b/Lib/os.py @@ -275,7 +275,7 @@ def removedirs(name): while head and tail: try: rmdir(head)

•    except error:[](#l2.7)

•    except OSrror:[](#l2.8)
         break[](#l2.9)
     head, tail = path.split(head)[](#l2.10)

@@ -302,7 +302,7 @@ def renames(old, new): if head and tail: try: removedirs(head)

•    except error:[](#l2.16)

•    except OSError:[](#l2.17)
         pass[](#l2.18)

all.extend(["makedirs", "removedirs", "renames"]) @@ -372,10 +372,10 @@ def walk(top, topdown=True, onerror=None # minor reason when (say) a thousand readable directories are still # left to visit. That logic is copied here. try:

•    # Note that listdir and error are globals in this module due[](#l2.25)

•    # Note that listdir is global in this module due[](#l2.26)
     # to earlier import-*.[](#l2.27)
     names = listdir(top)[](#l2.28)

• except error as err:

• except OSError as err: if onerror is not None: onerror(err) return

@@ -477,7 +477,7 @@ if {open, stat} <= supports_dir_fd and { try: orig_st = stat(name, dir_fd=topfd, follow_symlinks=follow_symlinks) dirfd = open(name, O_RDONLY, dir_fd=topfd)

•        except error as err:[](#l2.38)

•        except OSError as err:[](#l2.39)
             if onerror is not None:[](#l2.40)
                 onerror(err)[](#l2.41)
             return[](#l2.42)

@@ -572,7 +572,7 @@ def _execvpe(file, args, env=None): fullname = path.join(dir, file) try: exec_func(fullname, *argrest)

•    except error as e:[](#l2.47)

•    except OSError as e:[](#l2.48)
         last_exc = e[](#l2.49)
         tb = sys.exc_info()[2][](#l2.50)
         if (e.errno != errno.ENOENT and e.errno != errno.ENOTDIR[](#l2.51)

@@ -830,7 +830,7 @@ if _exists("fork") and not _exists("spaw elif WIFEXITED(sts): return WEXITSTATUS(sts) else:

•                raise error("Not stopped, signaled or exited???")[](#l2.56)

•                raise OSError("Not stopped, signaled or exited???")[](#l2.57)

def spawnv(mode, file, args): """spawnv(mode, file, args) -> integer

--- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py @@ -773,7 +773,7 @@ class ByteArrayTest(BaseBytesTest): finally: try: os.remove(tfn)

•        except os.error:[](#l3.7)

•        except OSError:[](#l3.8)
             pass[](#l3.9)

def test_reverse(self):

--- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -1190,31 +1190,31 @@ if sys.platform != 'win32': if hasattr(os, 'setuid'): def test_setuid(self): if os.getuid() != 0:

•                self.assertRaises(os.error, os.setuid, 0)[](#l4.7)

•                self.assertRaises(OSError, os.setuid, 0)[](#l4.8)
             self.assertRaises(OverflowError, os.setuid, 1<<32)[](#l4.9)

if hasattr(os, 'setgid'): def test_setgid(self): if os.getuid() != 0:

•                self.assertRaises(os.error, os.setgid, 0)[](#l4.14)

•                self.assertRaises(OSError, os.setgid, 0)[](#l4.15)
             self.assertRaises(OverflowError, os.setgid, 1<<32)[](#l4.16)

if hasattr(os, 'seteuid'): def test_seteuid(self): if os.getuid() != 0:

•                self.assertRaises(os.error, os.seteuid, 0)[](#l4.21)

•                self.assertRaises(OSError, os.seteuid, 0)[](#l4.22)
             self.assertRaises(OverflowError, os.seteuid, 1<<32)[](#l4.23)

if hasattr(os, 'setegid'): def test_setegid(self): if os.getuid() != 0:

•                self.assertRaises(os.error, os.setegid, 0)[](#l4.28)

•                self.assertRaises(OSError, os.setegid, 0)[](#l4.29)
             self.assertRaises(OverflowError, os.setegid, 1<<32)[](#l4.30)

if hasattr(os, 'setreuid'): def test_setreuid(self): if os.getuid() != 0:

•                self.assertRaises(os.error, os.setreuid, 0, 0)[](#l4.35)

•                self.assertRaises(OSError, os.setreuid, 0, 0)[](#l4.36)
             self.assertRaises(OverflowError, os.setreuid, 1<<32, 0)[](#l4.37)
             self.assertRaises(OverflowError, os.setreuid, 0, 1<<32)[](#l4.38)

@@ -1228,7 +1228,7 @@ if sys.platform != 'win32': if hasattr(os, 'setregid'): def test_setregid(self): if os.getuid() != 0:

•                self.assertRaises(os.error, os.setregid, 0, 0)[](#l4.44)

•                self.assertRaises(OSError, os.setregid, 0, 0)[](#l4.45)
             self.assertRaises(OverflowError, os.setregid, 1<<32, 0)[](#l4.46)
             self.assertRaises(OverflowError, os.setregid, 0, 1<<32)[](#l4.47)

--- a/Lib/test/test_pty.py +++ b/Lib/test/test_pty.py @@ -187,7 +187,7 @@ class PtyTest(unittest.TestCase): ##debug("Reading from master_fd now that the child has exited") ##try: ## s1 = os.read(master_fd, 1024)

•        ##except os.error:[](#l5.7)

•        ##except OSError:[](#l5.8)
         ##    pass[](#l5.9)
         ##else:[](#l5.10)
         ##    raise TestFailed("Read from master_fd did not raise exception")[](#l5.11)

--- a/Tools/freeze/bkfile.py +++ b/Tools/freeze/bkfile.py @@ -7,11 +7,11 @@ class _BkFile: self.__backup = file + '~' try: os.unlink(self.__backup)

•    except os.error:[](#l6.7)

•    except OSError:[](#l6.8)
         pass[](#l6.9)
     try:[](#l6.10)
         os.rename(file, self.__backup)[](#l6.11)

•    except os.error:[](#l6.12)

•    except OSError:[](#l6.13)
         self.__backup = None[](#l6.14)
     self.__file = _orig_open(file, mode, bufsize)[](#l6.15)
     self.closed = self.__file.closed[](#l6.16)

--- a/Tools/freeze/freeze.py +++ b/Tools/freeze/freeze.py @@ -311,7 +311,7 @@ def main(): try: os.mkdir(odir) print("Created output directory", odir)

•    except os.error as msg:[](#l7.7)

•    except OSError as msg:[](#l7.8)
         usage('%s: mkdir failed (%s)' % (odir, str(msg)))[](#l7.9)

  base = '' if odir:

--- a/Tools/scripts/byext.py +++ b/Tools/scripts/byext.py @@ -25,7 +25,7 @@ class Stats: self.addstats("", "dirs", 1) try: names = os.listdir(dir)

•    except os.error as err:[](#l8.7)

•    except OSError as err:[](#l8.8)
         sys.stderr.write("Can't list %s: %s\n" % (dir, err))[](#l8.9)
         self.addstats("<dir>", "unlistable", 1)[](#l8.10)
         return[](#l8.11)

--- a/Tools/scripts/byteyears.py +++ b/Tools/scripts/byteyears.py @@ -43,7 +43,7 @@ def main(): for filename in sys.argv[1:]: try: st = statfunc(filename)

•    except os.error as msg:[](#l9.7)

•    except OSError as msg:[](#l9.8)
         sys.stderr.write("can't stat %r: %r\n" % (filename, msg))[](#l9.9)
         status = 1[](#l9.10)
         st = ()[](#l9.11)

--- a/Tools/scripts/checkpyc.py +++ b/Tools/scripts/checkpyc.py @@ -24,7 +24,7 @@ def main(): for dirname in sys.path: try: names = os.listdir(dirname)

•    except os.error:[](#l10.7)

•    except OSError:[](#l10.8)
         print('Cannot list directory', repr(dirname))[](#l10.9)
         continue[](#l10.10)
     if not silent:[](#l10.11)

@@ -34,7 +34,7 @@ def main(): name = os.path.join(dirname, name) try: st = os.stat(name)

•            except os.error:[](#l10.16)

•            except OSError:[](#l10.17)
                 print('Cannot stat', repr(name))[](#l10.18)
                 continue[](#l10.19)
             if verbose:[](#l10.20)

--- a/Tools/scripts/copytime.py +++ b/Tools/scripts/copytime.py @@ -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)

--- a/Tools/scripts/finddiv.py +++ b/Tools/scripts/finddiv.py @@ -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 = []

--- a/Tools/scripts/findlinksto.py +++ b/Tools/scripts/findlinksto.py @@ -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:[](#l13.7)

•    except OSError:[](#l13.8)
         pass[](#l13.9)

if name == 'main':

--- a/Tools/scripts/fixcid.py +++ b/Tools/scripts/fixcid.py @@ -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

--- a/Tools/scripts/ftpmirror.py +++ b/Tools/scripts/ftpmirror.py @@ -108,7 +108,7 @@ def mirrorsubdir(f, localdir): if verbose: print('Creating local directory', repr(localdir)) try: makedir(localdir)

•    except os.error as msg:[](#l15.7)

•    except OSError as msg:[](#l15.8)
         print("Failed to establish local directory", repr(localdir))[](#l15.9)
         return[](#l15.10)

  infofilename = os.path.join(localdir, '.mirrorinfo') @@ -183,7 +183,7 @@ def mirrorsubdir(f, localdir): continue try: os.unlink(tempname)

•    except os.error:[](#l15.16)

•    except OSError:[](#l15.17)
         pass[](#l15.18)
     if mode[0] == 'l':[](#l15.19)
         if verbose:[](#l15.20)

@@ -218,11 +218,11 @@ def mirrorsubdir(f, localdir): fp1.close() try: os.unlink(fullname)

•    except os.error:[](#l15.25)

•    except OSError:[](#l15.26)
         pass            # Ignore the error[](#l15.27)
     try:[](#l15.28)
         os.rename(tempname, fullname)[](#l15.29)

•    except os.error as msg:[](#l15.30)

•    except OSError as msg:[](#l15.31)
         print("Can't rename %r to %r: %s" % (tempname, fullname, msg))[](#l15.32)
         continue[](#l15.33)
     info[filename] = infostuff[](#l15.34)

@@ -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:[](#l15.48)

•    except OSError:[](#l15.49)
         names = [][](#l15.50)
     ok = 1[](#l15.51)
     for name in names:[](#l15.52)

@@ -322,13 +322,13 @@ def remove(fullname): return 0 try: os.rmdir(fullname)

•    except os.error as msg:[](#l15.57)

•    except OSError as msg:[](#l15.58)
         print("Can't remove local directory %r: %s" % (fullname, msg))[](#l15.59)
         return 0[](#l15.60)

  else: try: os.unlink(fullname)

•    except os.error as msg:[](#l15.64)

•    except OSError as msg:[](#l15.65)
         print("Can't remove local file %r: %s" % (fullname, msg))[](#l15.66)
         return 0[](#l15.67)

  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)

--- a/Tools/scripts/linktree.py +++ b/Tools/scripts/linktree.py @@ -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:

--- a/Tools/scripts/pathfix.py +++ b/Tools/scripts/pathfix.py @@ -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:[](#l17.36)

•        except OSError as msg:[](#l17.37)
             err('%s: reset of timestamp failed (%r)\n' % (filename, msg))[](#l17.38)
             return 1[](#l17.39)

  Return succes

--- a/Tools/scripts/pindent.py +++ b/Tools/scripts/pindent.py @@ -427,7 +427,7 @@ def complete_file(filename, stepsize = S # 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 = STE

  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 = S

  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)

--- a/Tools/scripts/treesync.py +++ b/Tools/scripts/treesync.py @@ -78,7 +78,7 @@ def process(slave, master): print("creating slave directory", slave) try: os.mkdir(slave)

•    except os.error as msg:[](#l19.7)

•    except OSError as msg:[](#l19.8)
         print("can't make slave directory", slave, ":", msg)[](#l19.9)
         return[](#l19.10)
     else:[](#l19.11)

--- a/Tools/scripts/untabify.py +++ b/Tools/scripts/untabify.py @@ -39,11 +39,11 @@ def process(filename, tabsize, verbose=T 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)

--- a/Tools/scripts/which.py +++ b/Tools/scripts/which.py @@ -29,7 +29,7 @@ def main(): filename = os.path.join(dir, prog) try: st = os.stat(filename)

•        except os.error:[](#l21.7)

•        except OSError:[](#l21.8)
             continue[](#l21.9)
         if not S_ISREG(st[ST_MODE]):[](#l21.10)
             msg(filename + ': not a disk file')[](#l21.11)