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
diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index d1ab01c..892e278 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1479,7 +1479,7 @@
object = type(object)
desc += ' object'
pager(title % desc + '\n\n' + text.document(object, name))
- except (ImportError, ErrorDuringImport), value:
+ except (ImportError, ErrorDuringImport) as value:
print value
def writedoc(thing, forceload=0):
@@ -1491,7 +1491,7 @@
file.write(page)
file.close()
print 'wrote', name + '.html'
- except (ImportError, ErrorDuringImport), value:
+ except (ImportError, ErrorDuringImport) as value:
print value
def writedocs(dir, pkgpath='', done=None):
@@ -1920,7 +1920,7 @@
if path and path != '.':
try:
obj = locate(path, forceload=1)
- except ErrorDuringImport, value:
+ except ErrorDuringImport as value:
self.send_document(path, html.escape(str(value)))
return
if obj:
@@ -2223,7 +2223,7 @@
writedoc(arg)
else:
help.help(arg)
- except ErrorDuringImport, value:
+ except ErrorDuringImport as value:
print value
except (getopt.error, BadUsage):