mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-18 14:40:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Reverted 16efa8d27e4c after discussion with Eric.

Browse source
This commit is contained in:
Vinay Sajip 2014-04-15 13:52:21 +01:00
parent 1e53f8d9bf
commit 809f90f369
3 changed files with 0 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_types.py
View file

@ -343,8 +343,6 @@ class TypesTests(unittest.TestCase):
self.assertRaises(ValueError, 3 .__format__, ",n") self.assertRaises(ValueError, 3 .__format__, ",n")
# can't have ',' with 'c' # can't have ',' with 'c'
self.assertRaises(ValueError, 3 .__format__, ",c") self.assertRaises(ValueError, 3 .__format__, ",c")
# can't have '#' with 'c'
self.assertRaises(ValueError, 3 .__format__, "#c")
# ensure that only int and float type specifiers work # ensure that only int and float type specifiers work
for format_spec in ([chr(x) for x in range(ord('a'), ord('z')+1)] + for format_spec in ([chr(x) for x in range(ord('a'), ord('z')+1)] +

4
Misc/NEWS
View file

@ -34,10 +34,6 @@ Core and Builtins
replacement fields. It now matches the behavior of str.format() in replacement fields. It now matches the behavior of str.format() in
this regard. Patches by Phil Elson and Ramchandra Apte. this regard. Patches by Phil Elson and Ramchandra Apte.
- Issue #8931: Make alternate formatting ('#') for type 'c' raise an
exception. It had no effect, now trying to specify it is an error.
Patch by Torsten Landschoff.
Library Library
------- -------

7
Python/formatter_unicode.c
View file

@ -846,13 +846,6 @@ format_long_internal(PyObject *value, const InternalFormatSpec *format,
" format specifier 'c'"); " format specifier 'c'");
goto done; goto done;
} }
/* error to request alternate format */
if (format->alternate) {
PyErr_SetString(PyExc_ValueError,
"Alternate form (#) not allowed with integer"
" format specifier 'c'");
goto done;
}
/* taken from unicodeobject.c formatchar() */ /* taken from unicodeobject.c formatchar() */
/* Integer input truncated to a character */ /* Integer input truncated to a character */