mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 17:55:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

SF patch 1631942 by Collin Winter:

Browse source 
(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
Download patch file Download diff file Expand all files Collapse all files

8
Lib/poplib.py
View file

@ -86,7 +86,7 @@ class POP3:
try:
self.sock = socket.socket(af, socktype, proto)
self.sock.connect(sa)
except socket.error, msg:
except socket.error as msg:
if self.sock:
self.sock.close()
self.sock = None
@ -262,7 +262,7 @@ class POP3:
"""Signoff: commit changes on server, unlock mailbox, close connection."""
try:
resp = self._shortcmd('QUIT')
except error_proto, val:
except error_proto as val:
resp = val
self.file.close()
self.sock.close()
@ -347,7 +347,7 @@ class POP3_SSL(POP3):
try:
self.sock = socket.socket(af, socktype, proto)
self.sock.connect(sa)
except socket.error, msg:
except socket.error as msg:
if self.sock:
self.sock.close()
self.sock = None
@ -399,7 +399,7 @@ class POP3_SSL(POP3):
"""Signoff: commit changes on server, unlock mailbox, close connection."""
try:
resp = self._shortcmd('QUIT')
except error_proto, val:
except error_proto as val:
resp = val
self.sock.close()
del self.sslobj, self.sock