summaryrefslogtreecommitdiffstats
path: root/Modules/cjkcodecs
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-07-16 20:20:19 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-07-16 20:20:19 (GMT)
commit8cc80f1d8199a29a432c8caeb3142f9aa35012fd (patch)
tree7909c2e728f6cb5edd9b6e971f21df5946981288 /Modules/cjkcodecs
parenta3626bc5bddf9bf43f33060f4ea1a99f25e0c7f1 (diff)
parent579db160b392404b6dd9608ce5f5bef29a9885a4 (diff)
downloadcpython-8cc80f1d8199a29a432c8caeb3142f9aa35012fd.zip
cpython-8cc80f1d8199a29a432c8caeb3142f9aa35012fd.tar.gz
cpython-8cc80f1d8199a29a432c8caeb3142f9aa35012fd.tar.bz2
Merge 3.4
Diffstat (limited to 'Modules/cjkcodecs')
-rw-r--r--Modules/cjkcodecs/multibytecodec.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c
index c051514..e4547f7 100644
--- a/Modules/cjkcodecs/multibytecodec.c
+++ b/Modules/cjkcodecs/multibytecodec.c
@@ -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);