From 8dc33d56f55597096fa49afc3d36bed37147eb01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Walter=20D=C3=B6rwald?= Date: Wed, 6 May 2009 14:41:26 +0000 Subject: Merged revisions 72404-72406 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r72404 | walter.doerwald | 2009-05-06 16:28:24 +0200 (Mi, 06 Mai 2009) | 3 lines Issue 3739: The unicode-internal encoder now reports the number of *characters* consumed like any other encoder (instead of the number of bytes). ........ r72406 | walter.doerwald | 2009-05-06 16:32:35 +0200 (Mi, 06 Mai 2009) | 2 lines Add NEWS entry about issue #3739. ........ --- Modules/_codecsmodule.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Modules') diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c index cbcf84dd07..55b593b37d 100644 --- a/Modules/_codecsmodule.c +++ b/Modules/_codecsmodule.c @@ -669,7 +669,8 @@ unicode_internal_encode(PyObject *self, if (PyUnicode_Check(obj)) { data = PyUnicode_AS_DATA(obj); size = PyUnicode_GET_DATA_SIZE(obj); - return codec_tuple(PyBytes_FromStringAndSize(data, size), size); + return codec_tuple(PyBytes_FromStringAndSize(data, size), + PyUnicode_GET_SIZE(obj)); } else { if (PyObject_AsReadBuffer(obj, (const void **)&data, &size)) -- cgit v1.2.1