From: Guido van Rossum <guido@python.org>
Date: Fri, 24 Aug 2007 16:47:58 +0000 (+0000)
Subject: Clean up after a merge left behind old except clause syntax.
X-Git-Tag: v3.0a1~296
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f19f66250f8cdc416c15767e42b7023cc7e2b43;p=thirdparty%2FPython%2Fcpython.git

Clean up after a merge left behind old except clause syntax.
---

diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py
index 18e130da0f86..03080ab88669 100644
--- a/Lib/test/test_xmlrpc.py
+++ b/Lib/test/test_xmlrpc.py
@@ -306,7 +306,7 @@ class SimpleServerTestCase(unittest.TestCase):
         try:
             p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT)
             self.assertEqual(p.pow(6,8), 6**8)
-        except xmlrpclib.ProtocolError, e:
+        except xmlrpclib.ProtocolError as e:
             # protocol error; provide additional information in test output
             self.fail("%s\n%s" % (e, e.headers))
 
@@ -317,7 +317,7 @@ class SimpleServerTestCase(unittest.TestCase):
             expected_methods = set(['pow', 'div', 'add', 'system.listMethods',
                 'system.methodHelp', 'system.methodSignature', 'system.multicall'])
             self.assertEqual(set(meth), expected_methods)
-        except xmlrpclib.ProtocolError, e:
+        except xmlrpclib.ProtocolError as e:
             # protocol error; provide additional information in test output
             self.fail("%s\n%s" % (e, e.headers))
 
@@ -326,7 +326,7 @@ class SimpleServerTestCase(unittest.TestCase):
             p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT)
             divhelp = p.system.methodHelp('div')
             self.assertEqual(divhelp, 'This is the div function')
-        except xmlrpclib.ProtocolError, e:
+        except xmlrpclib.ProtocolError as e:
             # protocol error; provide additional information in test output
             self.fail("%s\n%s" % (e, e.headers))
 
@@ -337,7 +337,7 @@ class SimpleServerTestCase(unittest.TestCase):
             p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT)
             divsig = p.system.methodSignature('div')
             self.assertEqual(divsig, 'signatures not supported')
-        except xmlrpclib.ProtocolError, e:
+        except xmlrpclib.ProtocolError as e:
             # protocol error; provide additional information in test output
             self.fail("%s\n%s" % (e, e.headers))
 
@@ -352,7 +352,7 @@ class SimpleServerTestCase(unittest.TestCase):
             self.assertEqual(add_result, 2+3)
             self.assertEqual(pow_result, 6**8)
             self.assertEqual(div_result, 127//42)
-        except xmlrpclib.ProtocolError, e:
+        except xmlrpclib.ProtocolError as e:
             # protocol error; provide additional information in test output
             self.fail("%s\n%s" % (e, e.headers))
 
@@ -402,7 +402,7 @@ class FailingServerTestCase(unittest.TestCase):
         try:
             p = xmlrpclib.ServerProxy('http://localhost:%d' % PORT)
             self.assertEqual(p.pow(6,8), 6**8)
-        except xmlrpclib.ProtocolError, e:
+        except xmlrpclib.ProtocolError as e:
             # protocol error; provide additional information in test output
             self.fail("%s\n%s" % (e, e.headers))