diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-01-22 09:09:24 +0100 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-01-22 09:09:24 +0100 |
| commit | 3fd279ebe09bbd98f93b1a74e44bf69b05f28b14 (patch) | |
| tree | a29b724be9b4d73eaf040c1da3f06eb30440304c /Python/formatter_unicode.c | |
| parent | f21948c9b62b6c4e31a5d10f4c4eddd8cb3e2331 (diff) | |
| parent | 7d98c6e7cca7c964ce01afdf88125b147b57943f (diff) | |
| download | cpython-3fd279ebe09bbd98f93b1a74e44bf69b05f28b14.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 */ |