Mercurial > cpython-lru_cache-weakref
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 60333:893c74d547ee | 60340:cfe5fa34db46 |
|---|---|
| 215 if (_PyBytes_Resize(&v, (p - PyBytes_AS_STRING(v)))) { | 215 if (_PyBytes_Resize(&v, (p - PyBytes_AS_STRING(v)))) { |
| 216 return NULL; | 216 return NULL; |
| 217 } | 217 } |
| 218 } | 218 } |
| 219 | 219 |
| 220 return codec_tuple(v, PyBytes_Size(v)); | 220 return codec_tuple(v, size); |
| 221 } | 221 } |
| 222 | 222 |
| 223 /* --- Decoder ------------------------------------------------------------ */ | 223 /* --- Decoder ------------------------------------------------------------ */ |
| 224 | 224 |
| 225 static PyObject * | 225 static PyObject * |