diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-10-06 21:11:25 -0400 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-10-06 21:11:25 -0400 |
| commit | 9c06648ea3157945a37a3b38e35d71c948b998dd (patch) | |
| tree | 6bc2c56520ecad5d30a8b5bbfcc2c05191cfc43f /Python/formatter_unicode.c | |
| parent | 1c41575d9be1e2bcce4916ed170fceacf456dd65 (diff) | |
| parent | 9d2ec0c84470eb9fdec4fe87cb223a425370e6c3 (diff) | |
| download | cpython-9c06648ea3157945a37a3b38e35d71c948b998dd.tar.gz | |
merge 3.4
Diffstat (limited to 'Python/formatter_unicode.c')
| -rw-r--r-- | Python/formatter_unicode.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c index e3a8149841..056bb76902 100644 --- a/Python/formatter_unicode.c +++ b/Python/formatter_unicode.c @@ -846,6 +846,13 @@ format_long_internal(PyObject *value, const InternalFormatSpec *format, " format specifier 'c'"); 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() */ /* Integer input truncated to a character */ |