diff options
| author | Eric Smith <eric@trueblade.com> | 2007-09-04 23:04:22 (GMT) |
|---|---|---|
| committer | Eric Smith <eric@trueblade.com> | 2007-09-04 23:04:22 (GMT) |
| commit | 11529195cae2438a3ac003babcb1b11af67c4037 (patch) | |
| tree | 2bf0ac780377e409f87ad51aca8d8bc7c882f015 /Lib/test/test_unicode.py | |
| parent | 0af17617c51d6cae4c0b7ff225751e07183b96f2 (diff) | |
| download | cpython-11529195cae2438a3ac003babcb1b11af67c4037.zip cpython-11529195cae2438a3ac003babcb1b11af67c4037.tar.gz cpython-11529195cae2438a3ac003babcb1b11af67c4037.tar.bz2 | |
Changed some ValueError's to KeyError and IndexError.
Corrected code for invalid conversion specifier.
Added tests to verify.
Modified string.Formatter to correctly expand format_spec's,
and added a limit to recursion depth. Added _vformat()
method to support both of these.
Diffstat (limited to 'Lib/test/test_unicode.py')
| -rw-r--r-- | Lib/test/test_unicode.py | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py index 52b7b4f..64cca3f 100644 --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -542,29 +542,30 @@ class UnicodeTest( self.assertRaises(ValueError, 'a}'.format) self.assertRaises(ValueError, '{a'.format) self.assertRaises(ValueError, '}a'.format) - self.assertRaises(ValueError, '{0}'.format) - self.assertRaises(ValueError, '{1}'.format, 'abc') - self.assertRaises(ValueError, '{x}'.format) + self.assertRaises(IndexError, '{0}'.format) + self.assertRaises(IndexError, '{1}'.format, 'abc') + self.assertRaises(KeyError, '{x}'.format) self.assertRaises(ValueError, "}{".format) self.assertRaises(ValueError, "{".format) self.assertRaises(ValueError, "}".format) self.assertRaises(ValueError, "abc{0:{}".format) self.assertRaises(ValueError, "{0".format) - self.assertRaises(ValueError, "{0.}".format) - self.assertRaises(ValueError, "{0[}".format) + self.assertRaises(IndexError, "{0.}".format) + self.assertRaises(ValueError, "{0.}".format, 0) + self.assertRaises(IndexError, "{0[}".format) self.assertRaises(ValueError, "{0[}".format, []) - self.assertRaises(ValueError, "{0]}".format) - self.assertRaises(ValueError, "{0.[]}".format) + self.assertRaises(KeyError, "{0]}".format) + self.assertRaises(ValueError, "{0.[]}".format, 0) self.assertRaises(ValueError, "{0..foo}".format, 0) - self.assertRaises(ValueError, "{0[0}".format) - self.assertRaises(ValueError, "{0[0:foo}".format) - self.assertRaises(ValueError, "{c]}".format) - self.assertRaises(ValueError, "{{ {{{0}}".format) - self.assertRaises(ValueError, "{0}}".format) - self.assertRaises(ValueError, "{foo}".format, bar=3) + self.assertRaises(ValueError, "{0[0}".format, 0) + self.assertRaises(ValueError, "{0[0:foo}".format, 0) + self.assertRaises(KeyError, "{c]}".format) + self.assertRaises(ValueError, "{{ {{{0}}".format, 0) + self.assertRaises(ValueError, "{0}}".format, 0) + self.assertRaises(KeyError, "{foo}".format, bar=3) self.assertRaises(ValueError, "{0!x}".format, 3) - self.assertRaises(ValueError, "{0!}".format) - self.assertRaises(ValueError, "{0!rs}".format) + self.assertRaises(ValueError, "{0!}".format, 0) + self.assertRaises(ValueError, "{0!rs}".format, 0) self.assertRaises(ValueError, "{!}".format) self.assertRaises(ValueError, "{:}".format) self.assertRaises(ValueError, "{:s}".format) |