diff options
| author | Philip Jenvey <pjenvey@underboss.org> | 2010-06-09 17:56:11 (GMT) |
|---|---|---|
| committer | Philip Jenvey <pjenvey@underboss.org> | 2010-06-09 17:56:11 (GMT) |
| commit | ddf0d0383cf0f262232e7f336f1a6da0c61be966 (patch) | |
| tree | fb89ca64fac655c141604b60b9c3d6f3eb18e424 /Modules | |
| parent | a57aae7d47a20b2cb579b51192d39b9d0521c979 (diff) | |
| download | cpython-ddf0d0383cf0f262232e7f336f1a6da0c61be966.zip cpython-ddf0d0383cf0f262232e7f336f1a6da0c61be966.tar.gz cpython-ddf0d0383cf0f262232e7f336f1a6da0c61be966.tar.bz2 | |
Merged revisions 79780 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r79780 | philip.jenvey | 2010-04-04 20:05:24 -0700 (Sun, 04 Apr 2010) | 9 lines
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')
| -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 a23b073..aac4470 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 ------------------------------------------------------------ */ |