summaryrefslogtreecommitdiffstats
path: root/Lib/os.py
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-01-10 16:19:56 (GMT)
committerGuido van Rossum <guido@python.org>2007-01-10 16:19:56 (GMT)
commitb940e113bf90ff71b0ef57414ea2beea9d2a4bc0 (patch)
tree0b9ea19eba1e665dac95126c3140ac2bc36326ad /Lib/os.py
parent893523e80a2003d4a630aafb84ba016e0070cbbd (diff)
downloadcpython-b940e113bf90ff71b0ef57414ea2beea9d2a4bc0.zip
cpython-b940e113bf90ff71b0ef57414ea2beea9d2a4bc0.tar.gz
cpython-b940e113bf90ff71b0ef57414ea2beea9d2a4bc0.tar.bz2
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
Diffstat (limited to 'Lib/os.py')
-rw-r--r--Lib/os.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/os.py b/Lib/os.py
index 35f97fb..9599cf3 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -163,7 +163,7 @@ def makedirs(name, mode=0777):
if head and tail and not path.exists(head):
try:
makedirs(head, mode)
- except OSError, e:
+ except OSError as e:
# be happy if someone already created the path
if e.errno != EEXIST:
raise
@@ -284,7 +284,7 @@ def walk(top, topdown=True, onerror=None):
# Note that listdir and error are globals in this module due
# to earlier import-*.
names = listdir(top)
- except error, err:
+ except error as err:
if onerror is not None:
onerror(err)
return
@@ -390,7 +390,7 @@ def _execvpe(file, args, env=None):
fullname = path.join(dir, file)
try:
func(fullname, *argrest)
- except error, e:
+ except error as e:
tb = sys.exc_info()[2]
if (e.errno != ENOENT and e.errno != ENOTDIR
and saved_exc is None):