mirror of
https://github.com/python/cpython.git
synced 2025-11-02 03:01:58 +00:00
Issue 7994: Make object.__format__() raise a PendingDeprecationWarning
if the format string is not empty. Manually merge r79596 and r84772 from 2.x. Also, apparently test_format() from test_builtin never made it into 3.x. I've added it as well. It tests the basic format() infrastructure.
This commit is contained in:
parent
af9d10aa30
commit
e4d6317c87
4 changed files with 144 additions and 6 deletions
|
|
@ -609,13 +609,16 @@ class UnicodeTest(string_tests.CommonTest,
|
|||
self.assertEqual('{0}'.format({}), '{}')
|
||||
self.assertEqual('{0}'.format([]), '[]')
|
||||
self.assertEqual('{0}'.format([1]), '[1]')
|
||||
self.assertEqual('{0}'.format(E('data')), 'E(data)')
|
||||
self.assertEqual('{0:^10}'.format(E('data')), ' E(data) ')
|
||||
self.assertEqual('{0:^10s}'.format(E('data')), ' E(data) ')
|
||||
|
||||
self.assertEqual('{0:d}'.format(G('data')), 'G(data)')
|
||||
self.assertEqual('{0:>15s}'.format(G('data')), ' string is data')
|
||||
self.assertEqual('{0!s}'.format(G('data')), 'string is data')
|
||||
|
||||
msg = 'object.__format__ with a non-empty format string is deprecated'
|
||||
with support.check_warnings((msg, PendingDeprecationWarning)):
|
||||
self.assertEqual('{0:^10}'.format(E('data')), ' E(data) ')
|
||||
self.assertEqual('{0:^10s}'.format(E('data')), ' E(data) ')
|
||||
self.assertEqual('{0:>15s}'.format(G('data')), ' string is data')
|
||||
|
||||
self.assertEqual("{0:date: %Y-%m-%d}".format(I(year=2007,
|
||||
month=8,
|
||||
day=27)),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue