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/urllib.py b/Lib/urllib.py
index 27ec2c9..aacc373 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -190,7 +190,7 @@
return getattr(self, name)(url)
else:
return getattr(self, name)(url, data)
- except socket.error, msg:
+ except socket.error as msg:
raise IOError, ('socket error', msg), sys.exc_info()[2]
def open_unknown(self, fullurl, data=None):
@@ -217,7 +217,7 @@
hdrs = fp.info()
del fp
return url2pathname(splithost(url1)[1]), hdrs
- except IOError, msg:
+ except IOError as msg:
pass
fp = self.open(url, data)
headers = fp.info()
@@ -461,7 +461,7 @@
localname = url2pathname(file)
try:
stats = os.stat(localname)
- except OSError, e:
+ except OSError as e:
raise IOError(e.errno, e.strerror, e.filename)
size = stats.st_size
modified = email.Utils.formatdate(stats.st_mtime, usegmt=True)
@@ -544,7 +544,7 @@
headers += "Content-Length: %d\n" % retrlen
headers = mimetools.Message(StringIO(headers))
return addinfourl(fp, headers, "ftp:" + url)
- except ftperrors(), msg:
+ except ftperrors() as msg:
raise IOError, ('ftp error', msg), sys.exc_info()[2]
def open_data(self, url, data=None):
@@ -861,7 +861,7 @@
try:
cmd = 'RETR ' + file
conn = self.ftp.ntransfercmd(cmd)
- except ftplib.error_perm, reason:
+ except ftplib.error_perm as reason:
if str(reason)[:3] != '550':
raise IOError, ('ftp error', reason), sys.exc_info()[2]
if not conn:
@@ -1503,7 +1503,7 @@
import getopt, sys
try:
opts, args = getopt.getopt(sys.argv[1:], "th")
- except getopt.error, msg:
+ except getopt.error as msg:
print msg
print "Use -h for help"
return