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 974ebd4..d2799c3 100644
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -905,6 +905,8 @@
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 55b593b..041e0ae 100644
--- a/Modules/_codecsmodule.c
+++ b/Modules/_codecsmodule.c
@@ -217,7 +217,7 @@
}
}
- return codec_tuple(v, PyBytes_Size(v));
+ return codec_tuple(v, size);
}
/* --- Decoder ------------------------------------------------------------ */