From ddf0d0383cf0f262232e7f336f1a6da0c61be966 Mon Sep 17 00:00:00 2001 From: Philip Jenvey Date: Wed, 9 Jun 2010 17:56:11 +0000 Subject: [PATCH] Merged revisions 79780 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r79780 | philip.jenvey | 2010-04-04 20:05:24 -0700 (Sun, 04 Apr 2010) | 9 lines Merged revisions 79779 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79779 | philip.jenvey | 2010-04-04 19:51:51 -0700 (Sun, 04 Apr 2010) | 2 lines fix escape_encode to return the correct consumed size ........ ................ --- Lib/test/test_codecs.py | 2 ++ Misc/NEWS | 2 ++ Modules/_codecsmodule.c | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py index 5d6b5453f5..5db5dcb981 100644 --- a/Lib/test/test_codecs.py +++ b/Lib/test/test_codecs.py @@ -915,6 +915,8 @@ class UnicodeInternalTest(unittest.TestCase): self.assertEquals(encoder("a")[1], 1) self.assertEquals(encoder("\xe9\u0142")[1], 2) + self.assertEquals(codecs.escape_encode(br'\x00')[1], 4) + # From http://www.gnu.org/software/libidn/draft-josefsson-idn-test-vectors.html nameprep_tests = [ # 3.1 Map to nothing. diff --git a/Misc/NEWS b/Misc/NEWS index 5fe35fc466..9638ebd488 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -57,6 +57,8 @@ C-API Library ------- +- Fix codecs.escape_encode to return the correct consumed size. + - Issue #8897: Fix sunau module, use bytes to write the header. Patch written by Thomas Jollans. diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c index a23b073d18..aac44703ad 100644 --- a/Modules/_codecsmodule.c +++ b/Modules/_codecsmodule.c @@ -217,7 +217,7 @@ escape_encode(PyObject *self, } } - return codec_tuple(v, PyBytes_Size(v)); + return codec_tuple(v, size); } /* --- Decoder ------------------------------------------------------------ */ -- 2.40.0