SF patch 1631942 by Collin Winter:

(a) "except E, V" -> "except E as V"
(b) V is now limited to a simple name (local variable)
(c) V is now deleted at the end of the except block
This commit is contained in:
Guido van Rossum 2007-01-10 16:19:56 +00:00
parent 893523e80a
commit b940e113bf
295 changed files with 817 additions and 743 deletions

View file

@ -201,7 +201,7 @@ def _get_default_tempdir():
_os.unlink(filename)
del fp, fd
return dir
except (OSError, IOError), e:
except (OSError, IOError) as e:
if e[0] != _errno.EEXIST:
break # no point trying more names in this directory
pass
@ -236,7 +236,7 @@ def _mkstemp_inner(dir, pre, suf, flags):
fd = _os.open(file, flags, 0600)
_set_cloexec(fd)
return (fd, _os.path.abspath(file))
except OSError, e:
except OSError as e:
if e.errno == _errno.EEXIST:
continue # try again
raise
@ -327,7 +327,7 @@ def mkdtemp(suffix="", prefix=template, dir=None):
try:
_os.mkdir(file, 0700)
return file
except OSError, e:
except OSError as e:
if e.errno == _errno.EEXIST:
continue # try again
raise