diff options
| author | Martin v. Loewis <martin@v.loewis.de> | 2013-03-24 22:12:19 +0100 |
|---|---|---|
| committer | Martin v. Loewis <martin@v.loewis.de> | 2013-03-24 22:12:19 +0100 |
| commit | 650458ab36c29cfd3906f4940eabd01b8b523b5c (patch) | |
| tree | 4463730700404c235bb38a2479a382a4d1c71653 /Python/formatter_unicode.c | |
| parent | 29a7032a9fa9327c158d9d09a8d7a8942c4f87d5 (diff) | |
| parent | e298eef2c67880b4773a6678310b066406385824 (diff) | |
| download | cpython-650458ab36c29cfd3906f4940eabd01b8b523b5c.tar.gz | |
merge 3.3
Diffstat (limited to 'Python/formatter_unicode.c')
| -rw-r--r-- | Python/formatter_unicode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c index 17eb9789e0..79fa469697 100644 --- a/Python/formatter_unicode.c +++ b/Python/formatter_unicode.c @@ -757,7 +757,8 @@ format_string_internal(PyObject *value, const InternalFormatSpec *format, goto done; } - if (format->width == -1 && format->precision == -1) { + if ((format->width == -1 || format->width <= len) + && (format->precision == -1 || format->precision >= len)) { /* Fast path */ return _PyUnicodeWriter_WriteStr(writer, value); } |