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 974ebd40636b7817ea0ba7216c651aa7d76fa703..d2799c39d0c8bb87d9e0e4adba295087d738487b 100644 (file)
--- 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 55b593b37d50f083645f04b4f9977ead71c776dd..041e0aef203418f51301bd67844a94dbdca63804 100644 (file)
--- 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 ------------------------------------------------------------ */