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/urllib2.py b/Lib/urllib2.py
index a880e64..d14996d 100644
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -1072,7 +1072,7 @@
try:
h.request(req.get_method(), req.get_selector(), req.data, headers)
r = h.getresponse()
- except socket.error, err: # XXX what error?
+ except socket.error as err: # XXX what error?
raise URLError(err)
# Pick apart the HTTPResponse object to get the addinfourl
@@ -1254,7 +1254,7 @@
try:
host = socket.gethostbyname(host)
- except socket.error, msg:
+ except socket.error as msg:
raise URLError(msg)
path, attrs = splitattr(req.get_selector())
dirs = path.split('/')
@@ -1280,7 +1280,7 @@
sf = StringIO(headers)
headers = mimetools.Message(sf)
return addinfourl(fp, headers, req.get_full_url())
- except ftplib.all_errors, msg:
+ except ftplib.all_errors as msg:
raise IOError, ('ftp error', msg), sys.exc_info()[2]
def connect_ftp(self, user, passwd, host, port, dirs):