diff options
| -rw-r--r-- | Objects/unicodeobject.c | 17 | ||||
| -rw-r--r-- | Python/formatter_unicode.c | 6 |
2 files changed, 15 insertions, 8 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index a926e37..dee2953 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -13777,7 +13777,7 @@ unicode_format_arg_output(struct unicode_formatter_t *ctx, Py_ssize_t pindex; Py_UCS4 signchar; Py_ssize_t buflen; - Py_UCS4 maxchar, bufmaxchar; + Py_UCS4 maxchar; Py_ssize_t sublen; _PyUnicodeWriter *writer = &ctx->writer; Py_UCS4 fill; @@ -13830,23 +13830,26 @@ unicode_format_arg_output(struct unicode_formatter_t *ctx, arg->width = len; /* Prepare the writer */ - bufmaxchar = 127; + maxchar = writer->maxchar; if (!(arg->flags & F_LJUST)) { if (arg->sign) { if ((arg->width-1) > len) - bufmaxchar = MAX_MAXCHAR(bufmaxchar, fill); + maxchar = MAX_MAXCHAR(maxchar, fill); } else { if (arg->width > len) - bufmaxchar = MAX_MAXCHAR(bufmaxchar, fill); + maxchar = MAX_MAXCHAR(maxchar, fill); } } - maxchar = _PyUnicode_FindMaxChar(str, 0, pindex+len); - bufmaxchar = MAX_MAXCHAR(bufmaxchar, maxchar); + if (PyUnicode_MAX_CHAR_VALUE(str) > maxchar) { + Py_UCS4 strmaxchar = _PyUnicode_FindMaxChar(str, 0, pindex+len); + maxchar = MAX_MAXCHAR(maxchar, strmaxchar); + } + buflen = arg->width; if (arg->sign && len == arg->width) buflen++; - if (_PyUnicodeWriter_Prepare(writer, buflen, bufmaxchar) == -1) + if (_PyUnicodeWriter_Prepare(writer, buflen, maxchar) == -1) return -1; /* Write the sign if needed */ diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c index 79fa469..009bc5f 100644 --- a/Python/formatter_unicode.c +++ b/Python/formatter_unicode.c @@ -771,9 +771,13 @@ format_string_internal(PyObject *value, const InternalFormatSpec *format, calc_padding(len, format->width, format->align, &lpad, &rpad, &total); - maxchar = _PyUnicode_FindMaxChar(value, 0, len); + maxchar = writer->maxchar; if (lpad != 0 || rpad != 0) maxchar = Py_MAX(maxchar, format->fill_char); + if (PyUnicode_MAX_CHAR_VALUE(value) > maxchar) { + Py_UCS4 valmaxchar = _PyUnicode_FindMaxChar(value, 0, len); + maxchar = Py_MAX(maxchar, valmaxchar); + } /* allocate the resulting string */ if (_PyUnicodeWriter_Prepare(writer, total, maxchar) == -1) |