summaryrefslogtreecommitdiff
path: root/Lib/test/test_string.py
diff options
context:
space:
mode:
authordoko <doko@ubuntu.com>2017-01-31 13:35:56 +0100
committerdoko <doko@ubuntu.com>2017-01-31 13:35:56 +0100
commitb23072b8814146d3a76eb752fd7526eb1575e7cc (patch)
treecf13a75e5570561a10bf68c2c451e9271229a3be /Lib/test/test_string.py
parente0cb38ac4330d5e09b5e21c74c5d5e453af99a4f (diff)
parentccd19e48ec9d557231bf923c338be0e7509a51d3 (diff)
downloadcpython-b23072b8814146d3a76eb752fd7526eb1575e7cc.tar.gz
merge 3.6
Diffstat (limited to 'Lib/test/test_string.py')
-rw-r--r--Lib/test/test_string.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/Lib/test/test_string.py b/Lib/test/test_string.py
index 70439f85c8..a7b8aad8ab 100644
--- a/Lib/test/test_string.py
+++ b/Lib/test/test_string.py
@@ -48,9 +48,8 @@ class ModuleTest(unittest.TestCase):
self.assertEqual(fmt.format("-{format_string}-", format_string='test'),
'-test-')
self.assertRaises(KeyError, fmt.format, "-{format_string}-")
- with self.assertWarnsRegex(DeprecationWarning, "format_string"):
- self.assertEqual(fmt.format(arg='test', format_string="-{arg}-"),
- '-test-')
+ with self.assertRaisesRegex(TypeError, "format_string"):
+ fmt.format(format_string="-{arg}-", arg='test')
def test_auto_numbering(self):
fmt = string.Formatter()