summaryrefslogtreecommitdiff
path: root/Modules/_codecsmodule.c
diff options
context:
space:
mode:
authorPhilip Jenvey <pjenvey@underboss.org>2010-04-05 03:05:24 +0000
committerPhilip Jenvey <pjenvey@underboss.org>2010-04-05 03:05:24 +0000
commit66a1bd556860851c795df851b6f1f014b6306586 (patch)
tree5ec972571390b1f3c08d52e19ecfcbad3f4e0e34 /Modules/_codecsmodule.c
parentcfe0af4c0712e6493048cec37abad35522f70413 (diff)
downloadcpython-git-66a1bd556860851c795df851b6f1f014b6306586.tar.gz
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 ........
Diffstat (limited to 'Modules/_codecsmodule.c')
-rw-r--r--Modules/_codecsmodule.c2
1 files changed, 1 insertions, 1 deletions
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 ------------------------------------------------------------ */