diff options
| author | Eric V. Smith <eric@trueblade.com> | 2011-03-12 15:08:48 (GMT) |
|---|---|---|
| committer | Eric V. Smith <eric@trueblade.com> | 2011-03-12 15:08:48 (GMT) |
| commit | b9cd3531c42265f3063a7d202891a7497eb43130 (patch) | |
| tree | 5dbf0827151b1dcd51775038edfa3f82d9b6daab /Lib/test | |
| parent | e4f6a80ed843ac68ffbd1599d1dc0c55362df205 (diff) | |
| download | cpython-b9cd3531c42265f3063a7d202891a7497eb43130.zip cpython-b9cd3531c42265f3063a7d202891a7497eb43130.tar.gz cpython-b9cd3531c42265f3063a7d202891a7497eb43130.tar.bz2 | |
Issue 9856: Change object.__format__ with a non-empty format string from a PendingDeprecationWarning to a DeprecationWarning.
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_builtin.py | 6 | ||||
| -rw-r--r-- | Lib/test/test_unicode.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py index 61d4046..b094a65 100644 --- a/Lib/test/test_builtin.py +++ b/Lib/test/test_builtin.py @@ -1279,14 +1279,14 @@ class BuiltinTest(unittest.TestCase): # -------------------------------------------------------------------- # Issue #7994: object.__format__ with a non-empty format string is - # pending deprecated + # deprecated def test_deprecated_format_string(obj, fmt_str, should_raise_warning): with warnings.catch_warnings(record=True) as w: - warnings.simplefilter("always", PendingDeprecationWarning) + warnings.simplefilter("always", DeprecationWarning) format(obj, fmt_str) if should_raise_warning: self.assertEqual(len(w), 1) - self.assertIsInstance(w[0].message, PendingDeprecationWarning) + self.assertIsInstance(w[0].message, DeprecationWarning) self.assertIn('object.__format__ with a non-empty format ' 'string', str(w[0].message)) else: diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py index 5fc30db..ace3736 100644 --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -614,7 +614,7 @@ class UnicodeTest(string_tests.CommonTest, 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)): + with support.check_warnings((msg, DeprecationWarning)): 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') |