summaryrefslogtreecommitdiff
path: root/Python/formatter_unicode.c
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2015-01-23 21:19:53 +0000
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2015-01-23 21:19:53 +0000
commit25e326da3d6019e27a1313adcfd04f40fe8e7f77 (patch)
tree101f889280999cff5b2cba58721a93d204e6e689 /Python/formatter_unicode.c
parent602523212f6e8c403c43001bbee92623602ecce1 (diff)
parent8dd2d03028fc496557f4ab52e6fa36c119773236 (diff)
downloadcpython-25e326da3d6019e27a1313adcfd04f40fe8e7f77.tar.gz
Closes #23305: Merged documentation fix from 3.4.
Diffstat (limited to 'Python/formatter_unicode.c')
-rw-r--r--Python/formatter_unicode.c7
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 */