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

@ -156,7 +156,7 @@ class PackDialog(Dialog):
self.current = self.var.get()
try:
self.dialog.widget.pack(**{self.option: self.current})
except TclError, msg:
except TclError as msg:
print msg
self.refresh()
@ -212,7 +212,7 @@ class RemotePackDialog(PackDialog):
'pack',
'info',
self.widget))
except TclError, msg:
except TclError as msg:
print msg
return
dict = {}
@ -239,7 +239,7 @@ class RemotePackDialog(PackDialog):
'-'+self.option,
self.dialog.master.tk.merge(
self.current))
except TclError, msg:
except TclError as msg:
print msg
self.refresh()
@ -285,7 +285,7 @@ class WidgetDialog(Dialog):
self.current = self.var.get()
try:
self.dialog.widget[self.option] = self.current
except TclError, msg:
except TclError as msg:
print msg
self.refresh()
@ -374,7 +374,7 @@ class RemoteWidgetDialog(WidgetDialog):
self.master.send(self.app,
self.widget,
'config'))
except TclError, msg:
except TclError as msg:
print msg
return
dict = {}
@ -398,7 +398,7 @@ class RemoteWidgetDialog(WidgetDialog):
'config',
'-'+self.option,
self.current)
except TclError, msg:
except TclError as msg:
print msg
self.refresh()
@ -445,7 +445,7 @@ def opendialogs(e):
if widget == '.': continue
try:
RemotePackDialog(list, list.app, widget)
except TclError, msg:
except TclError as msg:
print msg
test()

View file

@ -95,7 +95,7 @@ class EditableManPage(ScrolledText):
self._parseline('')
try:
self.tk.deletefilehandler(self.fp)
except TclError, msg:
except TclError as msg:
pass
self.fp.close()
self.fp = None

View file

@ -27,7 +27,7 @@ def main():
seq = 'all'
try:
opts, args = getopt.getopt(sys.argv[1:], '')
except getopt.error, msg:
except getopt.error as msg:
print msg
sys.exit(2)
for arg in args:

View file

@ -216,7 +216,7 @@ class SelectionBox:
prog = re.compile(search, map)
else:
prog = re.compile(search)
except re.error, msg:
except re.error as msg:
self.frame.bell()
print 'Regex error:', msg
return

View file

@ -23,7 +23,7 @@ while 1:
tk.record(line)
try:
result = tk.call('eval', cmd)
except _tkinter.TclError, msg:
except _tkinter.TclError as msg:
print 'TclError:', msg
else:
if result: print result