summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2007-11-20 23:38:09 (GMT)
committerChristian Heimes <christian@cheimes.de>2007-11-20 23:38:09 (GMT)
commit5d14c2b8f87b23a9257c97b5f98dd097ca289c78 (patch)
treee7f70d363ad656494d995fce4e74e95ba70ca688 /Include
parent81e8ab5ba074694750072fb50081b77da16180a0 (diff)
downloadcpython-5d14c2b8f87b23a9257c97b5f98dd097ca289c78.zip
cpython-5d14c2b8f87b23a9257c97b5f98dd097ca289c78.tar.gz
cpython-5d14c2b8f87b23a9257c97b5f98dd097ca289c78.tar.bz2
Merged revisions 59056-59076 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r59064 | christian.heimes | 2007-11-20 02:48:48 +0100 (Tue, 20 Nov 2007) | 1 line Fixed bug #1470 ........ r59066 | martin.v.loewis | 2007-11-20 03:46:02 +0100 (Tue, 20 Nov 2007) | 2 lines Patch #1468: Package Lib/test/*.pem. ........ r59068 | christian.heimes | 2007-11-20 04:21:02 +0100 (Tue, 20 Nov 2007) | 1 line Another fix for test_shutil. Martin pointed out that it breaks some build bots ........ r59073 | nick.coghlan | 2007-11-20 15:55:57 +0100 (Tue, 20 Nov 2007) | 1 line Backport some main.c cleanup from the py3k branch ........ r59076 | amaury.forgeotdarc | 2007-11-21 00:31:27 +0100 (Wed, 21 Nov 2007) | 6 lines The incremental decoder for utf-7 must preserve its state between calls. Solves issue1460. Might not be a backport candidate: a new API function was added, and some code may rely on details in utf-7.py. ........
Diffstat (limited to 'Include')
-rw-r--r--Include/unicodeobject.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
index 203dcef..f3c37fe 100644
--- a/Include/unicodeobject.h
+++ b/Include/unicodeobject.h
@@ -751,6 +751,13 @@ PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF7(
const char *errors /* error handling */
);
+PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF7Stateful(
+ const char *string, /* UTF-7 encoded string */
+ Py_ssize_t length, /* size of string */
+ const char *errors, /* error handling */
+ Py_ssize_t *consumed /* bytes consumed */
+ );
+
PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF7(
const Py_UNICODE *data, /* Unicode char buffer */
Py_ssize_t length, /* number of Py_UNICODE chars to encode */