Merge 3.4

This commit is contained in:
Victor Stinner 2015-07-16 22:20:19 +02:00
commit 8cc80f1d81
3 changed files with 12 additions and 0 deletions

View file

@ -1685,6 +1685,9 @@ _multibytecodec_MultibyteStreamWriter_reset_impl(MultibyteStreamWriterObject *se
{
PyObject *pwrt;
if (!self->pending)
Py_RETURN_NONE;
pwrt = multibytecodec_encode(self->codec, &self->state,
self->pending, NULL, self->errors,
MBENC_FLUSH | MBENC_RESET);