summaryrefslogtreecommitdiff
path: root/Lib/test/test_string.py
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2017-02-02 19:17:51 +0000
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2017-02-02 19:17:51 +0000
commitb8cf82474245d48753ae34b76a272d5120895add (patch)
tree8bec37e99a342ac40fc8a0619897feaad7615061 /Lib/test/test_string.py
parent474ecf16ed434144efc0e1de383efda76f011e3f (diff)
parent14593e19e199dd34f268b35987ddb288bf022039 (diff)
downloadcpython-b8cf82474245d48753ae34b76a272d5120895add.tar.gz
Closes #24875: Merged fix from 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()