From: Berker Peksag <berker.peksag@gmail.com>
Date: Wed, 15 Mar 2017 11:12:53 +0000 (+0300)
Subject: Change assertRaises to assertRaisesRegex in test_xmlrpc (#481) (#674)
X-Git-Tag: v3.6.2rc1~314
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78add3309b53d68c2c5c118ec63f7485bbf93c9a;p=python

Change assertRaises to assertRaisesRegex in test_xmlrpc (#481) (#674)

(cherry picked from commit c6b448b36d22769c684bb3276f85c1b47d15ab63)
---

diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py
index 69de08e9c3..30025e388d 100644
--- a/Lib/test/test_xmlrpc.py
+++ b/Lib/test/test_xmlrpc.py
@@ -412,7 +412,7 @@ class SimpleXMLRPCDispatcherTestCase(unittest.TestCase):
 
         dispatcher = xmlrpc.server.SimpleXMLRPCDispatcher()
         dispatcher.register_function(None, name='method')
-        with self.assertRaises(Exception, expected_regex='method'):
+        with self.assertRaisesRegex(Exception, 'method'):
             dispatcher._dispatch('method', ('param',))
 
     def test_instance_has_no_func(self):
@@ -420,14 +420,14 @@ class SimpleXMLRPCDispatcherTestCase(unittest.TestCase):
 
         dispatcher = xmlrpc.server.SimpleXMLRPCDispatcher()
         dispatcher.register_instance(object())
-        with self.assertRaises(Exception, expected_regex='method'):
+        with self.assertRaisesRegex(Exception, 'method'):
             dispatcher._dispatch('method', ('param',))
 
     def test_cannot_locate_func(self):
         """Calls a function that the dispatcher cannot locate"""
 
         dispatcher = xmlrpc.server.SimpleXMLRPCDispatcher()
-        with self.assertRaises(Exception, expected_regex='method'):
+        with self.assertRaisesRegex(Exception, 'method'):
             dispatcher._dispatch('method', ('param',))