diff -r 7cfca9ede861 Lib/cgi.py --- a/Lib/cgi.py Tue Dec 18 22:18:58 2012 +0100 +++ b/Lib/cgi.py Wed Dec 19 00:02:56 2012 +0200 @@ -950,7 +950,7 @@ try: pwd = os.getcwd() except OSError as msg: - print("os.error:", html.escape(str(msg))) + print("OSError:", html.escape(str(msg))) else: print(html.escape(pwd)) print() diff -r 7cfca9ede861 Lib/os.py --- a/Lib/os.py Tue Dec 18 22:18:58 2012 +0100 +++ b/Lib/os.py Wed Dec 19 00:02:56 2012 +0200 @@ -275,7 +275,7 @@ while head and tail: try: rmdir(head) - except error: + except OSrror: break head, tail = path.split(head) @@ -302,7 +302,7 @@ if head and tail: try: removedirs(head) - except error: + except OSError: pass __all__.extend(["makedirs", "removedirs", "renames"]) @@ -372,10 +372,10 @@ # 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 + # Note that listdir is global in this module due # to earlier import-*. names = listdir(top) - except error as err: + except OSError as err: if onerror is not None: onerror(err) return @@ -477,7 +477,7 @@ try: orig_st = stat(name, dir_fd=topfd, follow_symlinks=follow_symlinks) dirfd = open(name, O_RDONLY, dir_fd=topfd) - except error as err: + except OSError as err: if onerror is not None: onerror(err) return @@ -572,7 +572,7 @@ fullname = path.join(dir, file) try: exec_func(fullname, *argrest) - except error as e: + except OSError as e: last_exc = e tb = sys.exc_info()[2] if (e.errno != errno.ENOENT and e.errno != errno.ENOTDIR @@ -830,7 +830,7 @@ elif WIFEXITED(sts): return WEXITSTATUS(sts) else: - raise error("Not stopped, signaled or exited???") + raise OSError("Not stopped, signaled or exited???") def spawnv(mode, file, args): """spawnv(mode, file, args) -> integer diff -r 7cfca9ede861 Lib/test/test_bytes.py --- a/Lib/test/test_bytes.py Tue Dec 18 22:18:58 2012 +0100 +++ b/Lib/test/test_bytes.py Wed Dec 19 00:02:56 2012 +0200 @@ -767,7 +767,7 @@ finally: try: os.remove(tfn) - except os.error: + except OSError: pass def test_reverse(self): diff -r 7cfca9ede861 Lib/test/test_os.py --- a/Lib/test/test_os.py Tue Dec 18 22:18:58 2012 +0100 +++ b/Lib/test/test_os.py Wed Dec 19 00:02:56 2012 +0200 @@ -1190,31 +1190,31 @@ if hasattr(os, 'setuid'): def test_setuid(self): if os.getuid() != 0: - self.assertRaises(os.error, os.setuid, 0) + self.assertRaises(OSError, os.setuid, 0) self.assertRaises(OverflowError, os.setuid, 1<<32) if hasattr(os, 'setgid'): def test_setgid(self): if os.getuid() != 0: - self.assertRaises(os.error, os.setgid, 0) + self.assertRaises(OSError, os.setgid, 0) self.assertRaises(OverflowError, os.setgid, 1<<32) if hasattr(os, 'seteuid'): def test_seteuid(self): if os.getuid() != 0: - self.assertRaises(os.error, os.seteuid, 0) + self.assertRaises(OSError, os.seteuid, 0) self.assertRaises(OverflowError, os.seteuid, 1<<32) if hasattr(os, 'setegid'): def test_setegid(self): if os.getuid() != 0: - self.assertRaises(os.error, os.setegid, 0) + self.assertRaises(OSError, os.setegid, 0) self.assertRaises(OverflowError, os.setegid, 1<<32) if hasattr(os, 'setreuid'): def test_setreuid(self): if os.getuid() != 0: - self.assertRaises(os.error, os.setreuid, 0, 0) + self.assertRaises(OSError, os.setreuid, 0, 0) self.assertRaises(OverflowError, os.setreuid, 1<<32, 0) self.assertRaises(OverflowError, os.setreuid, 0, 1<<32) @@ -1228,7 +1228,7 @@ if hasattr(os, 'setregid'): def test_setregid(self): if os.getuid() != 0: - self.assertRaises(os.error, os.setregid, 0, 0) + self.assertRaises(OSError, os.setregid, 0, 0) self.assertRaises(OverflowError, os.setregid, 1<<32, 0) self.assertRaises(OverflowError, os.setregid, 0, 1<<32) diff -r 7cfca9ede861 Lib/test/test_pty.py --- a/Lib/test/test_pty.py Tue Dec 18 22:18:58 2012 +0100 +++ b/Lib/test/test_pty.py Wed Dec 19 00:02:56 2012 +0200 @@ -187,7 +187,7 @@ ##debug("Reading from master_fd now that the child has exited") ##try: ## s1 = os.read(master_fd, 1024) - ##except os.error: + ##except OSError: ## pass ##else: ## raise TestFailed("Read from master_fd did not raise exception") diff -r 7cfca9ede861 PC/VC6/build_ssl.py --- a/PC/VC6/build_ssl.py Tue Dec 18 22:18:58 2012 +0100 +++ b/PC/VC6/build_ssl.py Wed Dec 19 00:02:56 2012 +0200 @@ -66,7 +66,7 @@ # note: do not abspath s; the build will fail if any # higher up directory name has spaces in it. fnames = os.listdir(s) - except os.error: + except OSError: fnames = [] for fname in fnames: fqn = os.path.join(s, fname) diff -r 7cfca9ede861 PC/VS7.1/build_ssl.py --- a/PC/VS7.1/build_ssl.py Tue Dec 18 22:18:58 2012 +0100 +++ b/PC/VS7.1/build_ssl.py Wed Dec 19 00:02:56 2012 +0200 @@ -62,7 +62,7 @@ # note: do not abspath s; the build will fail if any # higher up directory name has spaces in it. fnames = os.listdir(s) - except os.error: + except OSError: fnames = [] for fname in fnames: fqn = os.path.join(s, fname) diff -r 7cfca9ede861 PC/VS8.0/build_ssl.py --- a/PC/VS8.0/build_ssl.py Tue Dec 18 22:18:58 2012 +0100 +++ b/PC/VS8.0/build_ssl.py Wed Dec 19 00:02:56 2012 +0200 @@ -71,7 +71,7 @@ # note: do not abspath s; the build will fail if any # higher up directory name has spaces in it. fnames = os.listdir(s) - except os.error: + except OSError: fnames = [] for fname in fnames: fqn = os.path.join(s, fname) diff -r 7cfca9ede861 Tools/freeze/bkfile.py --- a/Tools/freeze/bkfile.py Tue Dec 18 22:18:58 2012 +0100 +++ b/Tools/freeze/bkfile.py Wed Dec 19 00:02:56 2012 +0200 @@ -7,11 +7,11 @@ self.__backup = file + '~' try: os.unlink(self.__backup) - except os.error: + except OSError: pass try: os.rename(file, self.__backup) - except os.error: + except OSError: self.__backup = None self.__file = _orig_open(file, mode, bufsize) self.closed = self.__file.closed diff -r 7cfca9ede861 Tools/freeze/freeze.py --- a/Tools/freeze/freeze.py Tue Dec 18 22:18:58 2012 +0100 +++ b/Tools/freeze/freeze.py Wed Dec 19 00:02:56 2012 +0200 @@ -311,7 +311,7 @@ try: os.mkdir(odir) print("Created output directory", odir) - except os.error as msg: + except OSError as msg: usage('%s: mkdir failed (%s)' % (odir, str(msg))) base = '' if odir: diff -r 7cfca9ede861 Tools/scripts/byext.py --- a/Tools/scripts/byext.py Tue Dec 18 22:18:58 2012 +0100 +++ b/Tools/scripts/byext.py Wed Dec 19 00:02:56 2012 +0200 @@ -25,7 +25,7 @@ self.addstats("", "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("", "unlistable", 1) return diff -r 7cfca9ede861 Tools/scripts/byteyears.py --- a/Tools/scripts/byteyears.py Tue Dec 18 22:18:58 2012 +0100 +++ b/Tools/scripts/byteyears.py Wed Dec 19 00:02:56 2012 +0200 @@ -43,7 +43,7 @@ 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 = () diff -r 7cfca9ede861 Tools/scripts/checkpyc.py --- a/Tools/scripts/checkpyc.py Tue Dec 18 22:18:58 2012 +0100 +++ b/Tools/scripts/checkpyc.py Wed Dec 19 00:02:56 2012 +0200 @@ -24,7 +24,7 @@ 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 @@ name = os.path.join(dirname, name) try: st = os.stat(name) - except os.error: + except OSError: print('Cannot stat', repr(name)) continue if verbose: diff -r 7cfca9ede861 Tools/scripts/copytime.py --- a/Tools/scripts/copytime.py Tue Dec 18 22:18:58 2012 +0100 +++ b/Tools/scripts/copytime.py Wed Dec 19 00:02:56 2012 +0200 @@ -13,12 +13,12 @@ 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) diff -r 7cfca9ede861 Tools/scripts/finddiv.py --- a/Tools/scripts/finddiv.py Tue Dec 18 22:18:58 2012 +0100 +++ b/Tools/scripts/finddiv.py Wed Dec 19 00:02:56 2012 +0200 @@ -70,7 +70,7 @@ 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 = [] diff -r 7cfca9ede861 Tools/scripts/findlinksto.py --- a/Tools/scripts/findlinksto.py Tue Dec 18 22:18:58 2012 +0100 +++ b/Tools/scripts/findlinksto.py Wed Dec 19 00:02:56 2012 +0200 @@ -36,7 +36,7 @@ linkto = os.readlink(name) if prog.search(linkto) is not None: print(name, '->', linkto) - except os.error: + except OSError: pass if __name__ == '__main__': diff -r 7cfca9ede861 Tools/scripts/fixcid.py --- a/Tools/scripts/fixcid.py Tue Dec 18 22:18:58 2012 +0100 +++ b/Tools/scripts/fixcid.py Wed Dec 19 00:02:56 2012 +0200 @@ -97,7 +97,7 @@ 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 @@ 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 diff -r 7cfca9ede861 Tools/scripts/ftpmirror.py --- a/Tools/scripts/ftpmirror.py Tue Dec 18 22:18:58 2012 +0100 +++ b/Tools/scripts/ftpmirror.py Wed Dec 19 00:02:56 2012 +0200 @@ -108,7 +108,7 @@ 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 @@ continue try: os.unlink(tempname) - except os.error: + except OSError: pass if mode[0] == 'l': if verbose: @@ -218,11 +218,11 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ fp.close() try: os.rename(filename, backup) - except os.error: + except OSError: pass os.rename(tempname, filename) diff -r 7cfca9ede861 Tools/scripts/linktree.py --- a/Tools/scripts/linktree.py Tue Dec 18 22:18:58 2012 +0100 +++ b/Tools/scripts/linktree.py Wed Dec 19 00:02:56 2012 +0200 @@ -32,13 +32,13 @@ 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 @@ 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: diff -r 7cfca9ede861 Tools/scripts/pathfix.py --- a/Tools/scripts/pathfix.py Tue Dec 18 22:18:58 2012 +0100 +++ b/Tools/scripts/pathfix.py Wed Dec 19 00:02:56 2012 +0200 @@ -73,7 +73,7 @@ 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 @@ 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 diff -r 7cfca9ede861 Tools/scripts/pindent.py --- a/Tools/scripts/pindent.py Tue Dec 18 22:18:58 2012 +0100 +++ b/Tools/scripts/pindent.py Wed Dec 19 00:02:56 2012 +0200 @@ -427,7 +427,7 @@ # 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 @@ # 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 @@ # 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) diff -r 7cfca9ede861 Tools/scripts/treesync.py --- a/Tools/scripts/treesync.py Tue Dec 18 22:18:58 2012 +0100 +++ b/Tools/scripts/treesync.py Wed Dec 19 00:02:56 2012 +0200 @@ -78,7 +78,7 @@ 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: diff -r 7cfca9ede861 Tools/scripts/untabify.py --- a/Tools/scripts/untabify.py Tue Dec 18 22:18:58 2012 +0100 +++ b/Tools/scripts/untabify.py Wed Dec 19 00:02:56 2012 +0200 @@ -39,11 +39,11 @@ 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) diff -r 7cfca9ede861 Tools/scripts/which.py --- a/Tools/scripts/which.py Tue Dec 18 22:18:58 2012 +0100 +++ b/Tools/scripts/which.py Wed Dec 19 00:02:56 2012 +0200 @@ -29,7 +29,7 @@ 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')