In 3 unit tests, test_xmlrpc calls assertRaises(Exception, expectedRegex='method'), causing DeprecationWarnings. These calls should be replaced with assertRaisesRegex(Exception, 'method'). 0:20:56 [378/404] test_xmlrpc 127.0.0.1 - - [05/Mar/2017 11:53:45] "POST / HTTP/1.1" 200 - 127.0.0.1 - - [05/Mar/2017 11:53:45] "POST / HTTP/1.1" 200 - /home/dillon/src/cpython/Lib/test/test_xmlrpc.py:430: DeprecationWarning: 'expected_regex' is an invalid keyword argument for this function with self.assertRaises(Exception, expected_regex='method'): /home/dillon/src/cpython/Lib/test/test_xmlrpc.py:423: DeprecationWarning: 'expected_regex' is an invalid keyword argument for this function with self.assertRaises(Exception, expected_regex='method'): /home/dillon/src/cpython/Lib/test/test_xmlrpc.py:415: DeprecationWarning: 'expected_regex' is an invalid keyword argument for this function with self.assertRaises(Exception, expected_regex='method'):
The cherry-pick is causing a merge conflict because 3.6 and 3.5 do not include the SimpleXMLRPCDispatcherTestCase that this fix modifies. Should I backport that entire test case as well as the fix?