diff Modules/_codecsmodule.c @ 60340:cfe5fa34db46

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 ........
author Philip Jenvey <pjenvey@underboss.org>
date Mon, 05 Apr 2010 03:05:24 +0000
parents 63b23bd3904d
children cab14be0ada1
line wrap: on
line diff
--- a/Modules/_codecsmodule.c	Sun Apr 04 23:27:45 2010 +0000
+++ b/Modules/_codecsmodule.c	Mon Apr 05 03:05:24 2010 +0000
@@ -217,7 +217,7 @@
 		}
 	}
 	
-	return codec_tuple(v, PyBytes_Size(v));
+	return codec_tuple(v, size);
 }
 
 /* --- Decoder ------------------------------------------------------------ */