diff options
| author | Philip Jenvey <pjenvey@underboss.org> | 2010-04-05 03:05:24 (GMT) |
|---|---|---|
| committer | Philip Jenvey <pjenvey@underboss.org> | 2010-04-05 03:05:24 (GMT) |
| commit | 66a1bd556860851c795df851b6f1f014b6306586 (patch) | |
| tree | 5ec972571390b1f3c08d52e19ecfcbad3f4e0e34 /Modules/_codecsmodule.c | |
| parent | cfe0af4c0712e6493048cec37abad35522f70413 (diff) | |
| download | cpython-66a1bd556860851c795df851b6f1f014b6306586.zip cpython-66a1bd556860851c795df851b6f1f014b6306586.tar.gz cpython-66a1bd556860851c795df851b6f1f014b6306586.tar.bz2 | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ escape_encode(PyObject *self, } } - return codec_tuple(v, PyBytes_Size(v)); + return codec_tuple(v, size); } /* --- Decoder ------------------------------------------------------------ */ |