From: Berker Peksag <berker.peksag@gmail.com>
Date: Wed, 15 Mar 2017 11:13:09 +0000 (+0300)
Subject: Change assertRaises to assertRaisesRegex in test_xmlrpc (#481) (#675)
X-Git-Tag: v3.5.4rc1~274
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a29d7577a6da0ab0f4411567204f1a93a2452b6;p=thirdparty%2FPython%2Fcpython.git

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

(cherry picked from commit c6b448b36d22769c684bb3276f85c1b47d15ab63)
---

diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py
index 7e023c167331..c2de057ecbfa 100644
--- a/Lib/test/test_xmlrpc.py
+++ b/Lib/test/test_xmlrpc.py
@@ -364,7 +364,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):
@@ -372,14 +372,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',))