diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2013-11-13 13:17:30 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2013-11-13 13:17:30 (GMT) |
| commit | 59799a83995f135bdb1b1a0994052c1f24c68e83 (patch) | |
| tree | df2516464ed158cd433f228c90b89c2baad00d4e /Modules | |
| parent | e223439c130db50c2d636f433a3f1ff438b532db (diff) | |
| download | cpython-59799a83995f135bdb1b1a0994052c1f24c68e83.zip cpython-59799a83995f135bdb1b1a0994052c1f24c68e83.tar.gz cpython-59799a83995f135bdb1b1a0994052c1f24c68e83.tar.bz2 | |
Don't use deprecated function PyUnicode_GET_SIZE()
Replace it with PyUnicode_GET_LENGTH() or PyUnicode_AsUnicodeAndSize()
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_elementtree.c | 2 | ||||
| -rw-r--r-- | Modules/posixmodule.c | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c index cb7069d..797e357 100644 --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -3461,7 +3461,7 @@ xmlparser_parse_whole(XMLParserObject* self, PyObject* args) if (PyUnicode_CheckExact(buffer)) { /* A unicode object is encoded into bytes using UTF-8 */ - if (PyUnicode_GET_SIZE(buffer) == 0) { + if (PyUnicode_GET_LENGTH(buffer) == 0) { Py_DECREF(buffer); break; } diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index f282f99..5e5f355 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -829,15 +829,14 @@ path_converter(PyObject *o, void *p) { if (unicode) { #ifdef MS_WINDOWS wchar_t *wide; - length = PyUnicode_GET_SIZE(unicode); - if (length > 32767) { - FORMAT_EXCEPTION(PyExc_ValueError, "%s too long for Windows"); + + wide = PyUnicode_AsUnicodeAndSize(unicode, &length); + if (!wide) { Py_DECREF(unicode); return 0; } - - wide = PyUnicode_AsUnicode(unicode); - if (!wide) { + if (length > 32767) { + FORMAT_EXCEPTION(PyExc_ValueError, "%s too long for Windows"); Py_DECREF(unicode); return 0; } |