diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_builtin.py | 24 | ||||
| -rw-r--r-- | Lib/test/test_bytes.py | 9 |
2 files changed, 20 insertions, 13 deletions
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py index 39c80b0..0b03340 100644 --- a/Lib/test/test_builtin.py +++ b/Lib/test/test_builtin.py @@ -11,6 +11,7 @@ import os import pickle import platform import random +import re import sys import traceback import types @@ -1447,21 +1448,14 @@ class BuiltinTest(unittest.TestCase): # -------------------------------------------------------------------- # Issue #7994: object.__format__ with a non-empty format string is - # deprecated - def test_deprecated_format_string(obj, fmt_str, should_raise): - if should_raise: - self.assertRaises(TypeError, format, obj, fmt_str) - else: - format(obj, fmt_str) - - fmt_strs = ['', 's'] - + # disallowed class A: def __format__(self, fmt_str): return format('', fmt_str) - for fmt_str in fmt_strs: - test_deprecated_format_string(A(), fmt_str, False) + self.assertEqual(format(A()), '') + self.assertEqual(format(A(), ''), '') + self.assertEqual(format(A(), 's'), '') class B: pass @@ -1470,8 +1464,12 @@ class BuiltinTest(unittest.TestCase): pass for cls in [object, B, C]: - for fmt_str in fmt_strs: - test_deprecated_format_string(cls(), fmt_str, len(fmt_str) != 0) + obj = cls() + self.assertEqual(format(obj), str(obj)) + self.assertEqual(format(obj, ''), str(obj)) + with self.assertRaisesRegex(TypeError, + r'\b%s\b' % re.escape(cls.__name__)): + format(obj, 's') # -------------------------------------------------------------------- # make sure we can take a subclass of str as a format spec diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py index cc312b1..3288a5b 100644 --- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py @@ -1259,6 +1259,15 @@ class AssortedBytesTest(unittest.TestCase): self.assertEqual(f(b"'"), '''b"'"''') # ''' self.assertEqual(f(b"'\""), r"""b'\'"'""") # ' + @check_bytes_warnings + def test_format(self): + for b in b'abc', bytearray(b'abc'): + self.assertEqual(format(b), str(b)) + self.assertEqual(format(b, ''), str(b)) + with self.assertRaisesRegex(TypeError, + r'\b%s\b' % re.escape(type(b).__name__)): + format(b, 's') + def test_compare_bytes_to_bytearray(self): self.assertEqual(b"abc" == bytes(b"abc"), True) self.assertEqual(b"ab" != bytes(b"abc"), True) |