ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 12:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

(Merge 3.1) Issue #12100: Don't reset incremental encoders of CJK codecs at

Browse source 
each call to their encode() method anymore, but continue to call the reset()
method if the final argument is True.
This commit is contained in:
Victor Stinner 2011-05-24 22:22:17 +02:00
commit d48ba0bde5
3 changed files with 38 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Modules/cjkcodecs/multibytecodec.c
View file

@ -479,7 +479,7 @@ multibytecodec_encode(MultibyteCodec *codec,
MultibyteEncodeBuffer buf;
Py_ssize_t finalsize, r = 0;
if (datalen == 0)
if (datalen == 0 && !(flags & MBENC_RESET))
return PyBytes_FromStringAndSize(NULL, 0);
buf.excobj = NULL;
@ -514,7 +514,7 @@ multibytecodec_encode(MultibyteCodec *codec,
break;
}
if (codec->encreset != NULL)
if (codec->encreset != NULL && (flags & MBENC_RESET))
for (;;) {
Py_ssize_t outleft;
@ -784,8 +784,8 @@ encoder_encode_stateful(MultibyteStatefulEncoderContext *ctx,
inbuf_end = inbuf + datalen;
r = multibytecodec_encode(ctx->codec, &ctx->state,
(const Py_UNICODE **)&inbuf,
datalen, ctx->errors, final ? MBENC_FLUSH : 0);
(const Py_UNICODE **)&inbuf, datalen,
ctx->errors, final ? MBENC_FLUSH | MBENC_RESET : 0);
if (r == NULL) {
/* recover the original pending buffer */
if (origpending > 0)