[Python-checkins] cpython (2.7): Issue #16341: convert examples to use except ... as ... syntax.
andrew.svetlov
python-checkins at python.org
Tue Oct 30 20:56:57 CET 2012
http://hg.python.org/cpython/rev/4e9617d3c514
changeset: 80061:4e9617d3c514
branch: 2.7
parent: 80050:626ed0e06fd6
user: Andrew Svetlov <andrew.svetlov at gmail.com>
date: Tue Oct 30 21:56:43 2012 +0200
summary:
Issue #16341: convert examples to use except ... as ... syntax.
files:
Doc/howto/urllib2.rst | 10 +++++-----
Doc/includes/email-unpack.py | 2 +-
Doc/includes/sqlite3/complete_statement.py | 2 +-
Doc/library/csv.rst | 2 +-
Doc/library/getopt.rst | 2 +-
Doc/library/shutil.rst | 6 +++---
Doc/library/socket.rst | 8 ++++----
Doc/library/ssl.rst | 2 +-
Doc/library/xdrlib.rst | 3 +--
Doc/library/xmlrpclib.rst | 6 +++---
10 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/Doc/howto/urllib2.rst b/Doc/howto/urllib2.rst
--- a/Doc/howto/urllib2.rst
+++ b/Doc/howto/urllib2.rst
@@ -201,7 +201,7 @@
>>> req = urllib2.Request('http://www.pretend_server.org')
>>> try: urllib2.urlopen(req)
- ... except URLError, e:
+ ... except URLError as e:
... print e.reason #doctest: +SKIP
...
(4, 'getaddrinfo failed')
@@ -310,7 +310,7 @@
>>> req = urllib2.Request('http://www.python.org/fish.html')
>>> try:
... urllib2.urlopen(req)
- ... except urllib2.HTTPError, e:
+ ... except urllib2.HTTPError as e:
... print e.code
... print e.read() #doctest: +ELLIPSIS, +NORMALIZE_WHITESPACE
...
@@ -338,10 +338,10 @@
req = Request(someurl)
try:
response = urlopen(req)
- except HTTPError, e:
+ except HTTPError as e:
print 'The server couldn\'t fulfill the request.'
print 'Error code: ', e.code
- except URLError, e:
+ except URLError as e:
print 'We failed to reach a server.'
print 'Reason: ', e.reason
else:
@@ -362,7 +362,7 @@
req = Request(someurl)
try:
response = urlopen(req)
- except URLError, e:
+ except URLError as e:
if hasattr(e, 'reason'):
print 'We failed to reach a server.'
print 'Reason: ', e.reason
diff --git a/Doc/includes/email-unpack.py b/Doc/includes/email-unpack.py
--- a/Doc/includes/email-unpack.py
+++ b/Doc/includes/email-unpack.py
@@ -35,7 +35,7 @@
try:
os.mkdir(opts.directory)
- except OSError, e:
+ except OSError as e:
# Ignore directory exists error
if e.errno != errno.EEXIST:
raise
diff --git a/Doc/includes/sqlite3/complete_statement.py b/Doc/includes/sqlite3/complete_statement.py
--- a/Doc/includes/sqlite3/complete_statement.py
+++ b/Doc/includes/sqlite3/complete_statement.py
@@ -23,7 +23,7 @@
if buffer.lstrip().upper().startswith("SELECT"):
print cur.fetchall()
- except sqlite3.Error, e:
+ except sqlite3.Error as e:
print "An error occurred:", e.args[0]
buffer = ""
diff --git a/Doc/library/csv.rst b/Doc/library/csv.rst
--- a/Doc/library/csv.rst
+++ b/Doc/library/csv.rst
@@ -480,7 +480,7 @@
try:
for row in reader:
print row
- except csv.Error, e:
+ except csv.Error as e:
sys.exit('file %s, line %d: %s' % (filename, reader.line_num, e))
And while the module doesn't directly support parsing strings, it can easily be
diff --git a/Doc/library/getopt.rst b/Doc/library/getopt.rst
--- a/Doc/library/getopt.rst
+++ b/Doc/library/getopt.rst
@@ -126,7 +126,7 @@
def main():
try:
opts, args = getopt.getopt(sys.argv[1:], "ho:v", ["help", "output="])
- except getopt.GetoptError, err:
+ except getopt.GetoptError as err:
# print help information and exit:
print str(err) # will print something like "option -a not recognized"
usage()
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@ -219,18 +219,18 @@
else:
copy2(srcname, dstname)
# XXX What about devices, sockets etc.?
- except (IOError, os.error), why:
+ except (IOError, os.error) as why:
errors.append((srcname, dstname, str(why)))
# catch the Error from the recursive copytree so that we can
# continue with other files
- except Error, err:
+ except Error as err:
errors.extend(err.args[0])
try:
copystat(src, dst)
except WindowsError:
# can't copy file access times on Windows
pass
- except OSError, why:
+ except OSError as why:
errors.extend((src, dst, str(why)))
if errors:
raise Error(errors)
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -920,13 +920,13 @@
af, socktype, proto, canonname, sa = res
try:
s = socket.socket(af, socktype, proto)
- except socket.error, msg:
+ except socket.error as msg:
s = None
continue
try:
s.bind(sa)
s.listen(1)
- except socket.error, msg:
+ except socket.error as msg:
s.close()
s = None
continue
@@ -955,12 +955,12 @@
af, socktype, proto, canonname, sa = res
try:
s = socket.socket(af, socktype, proto)
- except socket.error, msg:
+ except socket.error as msg:
s = None
continue
try:
s.connect(sa)
- except socket.error, msg:
+ except socket.error as msg:
s.close()
s = None
continue
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -361,7 +361,7 @@
try:
s.do_handshake()
break
- except ssl.SSLError, err:
+ except ssl.SSLError as err:
if err.args[0] == ssl.SSL_ERROR_WANT_READ:
select.select([s], [], [])
elif err.args[0] == ssl.SSL_ERROR_WANT_WRITE:
diff --git a/Doc/library/xdrlib.rst b/Doc/library/xdrlib.rst
--- a/Doc/library/xdrlib.rst
+++ b/Doc/library/xdrlib.rst
@@ -274,6 +274,5 @@
p = xdrlib.Packer()
try:
p.pack_double(8.01)
- except xdrlib.ConversionError, instance:
+ except xdrlib.ConversionError as instance:
print 'packing the double failed:', instance.msg
-
diff --git a/Doc/library/xmlrpclib.rst b/Doc/library/xmlrpclib.rst
--- a/Doc/library/xmlrpclib.rst
+++ b/Doc/library/xmlrpclib.rst
@@ -380,7 +380,7 @@
proxy = xmlrpclib.ServerProxy("http://localhost:8000/")
try:
proxy.add(2, 5)
- except xmlrpclib.Fault, err:
+ except xmlrpclib.Fault as err:
print "A fault occurred"
print "Fault code: %d" % err.faultCode
print "Fault string: %s" % err.faultString
@@ -427,7 +427,7 @@
try:
proxy.some_method()
- except xmlrpclib.ProtocolError, err:
+ except xmlrpclib.ProtocolError as err:
print "A protocol error occurred"
print "URL: %s" % err.url
print "HTTP/HTTPS headers: %s" % err.headers
@@ -545,7 +545,7 @@
try:
print server.examples.getStateName(41)
- except Error, v:
+ except Error as v:
print "ERROR", v
To access an XML-RPC server through a proxy, you need to define a custom
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list