mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-12 03:37:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

6
Lib/ftplib.py
View file

@ -119,7 +119,7 @@ class FTP:
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
@ -277,7 +277,7 @@ class FTP:
try:
sock = socket.socket(af, socktype, proto)
sock.bind(sa)
except socket.error, msg:
except socket.error as msg:
if sock:
sock.close()
sock = None
@ -496,7 +496,7 @@ class FTP:
if dirname == '..':
try:
return self.voidcmd('CDUP')
except error_perm, msg:
except error_perm as msg:
if msg.args[0][:3] != '500':
raise
elif dirname == '':