diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-17 12:56:29 +0200 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-17 12:56:29 +0200 |
| commit | 29b67bd25a1b781749bea5e22e80dcbe41f05dec (patch) | |
| tree | 6b8cb29b82b6890ac5f98c25fdf45878e9cd86fb /Python/formatter_unicode.c | |
| parent | b5477a0109194b7c8500037e063bfd29dca03391 (diff) | |
| parent | 444b8a182b5a690fdb3e4d28ca8a61de27949178 (diff) | |
| download | cpython-29b67bd25a1b781749bea5e22e80dcbe41f05dec.tar.gz | |
Merge updates about dir() with 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 aa62502dbe..0ce9862a20 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); } |