From: Philip Jenvey <pjenvey@underboss.org>
Date: Mon, 5 Apr 2010 03:05:24 +0000 (+0000)
Subject: Merged revisions 79779 via svnmerge from
X-Git-Tag: v3.2a1~1228
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66a1bd556860851c795df851b6f1f014b6306586;p=python

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
........
---

diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
index 974ebd4063..d2799c39d0 100644
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -905,6 +905,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/Modules/_codecsmodule.c b/Modules/_codecsmodule.c
index 55b593b37d..041e0aef20 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 ------------------------------------------------------------ */