diff options
| author | Guido van Rossum <guido@python.org> | 2007-01-10 16:19:56 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-01-10 16:19:56 (GMT) |
| commit | b940e113bf90ff71b0ef57414ea2beea9d2a4bc0 (patch) | |
| tree | 0b9ea19eba1e665dac95126c3140ac2bc36326ad /Lib/poplib.py | |
| parent | 893523e80a2003d4a630aafb84ba016e0070cbbd (diff) | |
| download | cpython-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/poplib.py')
| -rw-r--r-- | Lib/poplib.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/poplib.py b/Lib/poplib.py index 1cf114a..b7a7a8a 100644 --- a/Lib/poplib.py +++ b/Lib/poplib.py @@ -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 |