From 9e30aa52fd416e17b692c4f22e57191cdd6ec654 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 21 Nov 2011 02:49:52 +0100 Subject: [PATCH] Fix misuse of PyUnicode_GET_SIZE() => PyUnicode_GET_LENGTH() And PyUnicode_GetSize() => PyUnicode_GetLength() --- Modules/_csv.c | 2 +- Modules/_datetimemodule.c | 4 ++-- Modules/_gestalt.c | 2 +- Modules/_io/stringio.c | 2 +- Modules/_io/textio.c | 4 ++-- Objects/bytesobject.c | 2 +- Objects/exceptions.c | 4 ++-- Objects/unicodeobject.c | 4 ++-- PC/import_nt.c | 3 +-- Python/_warnings.c | 10 +++++----- 10 files changed, 18 insertions(+), 19 deletions(-) diff --git a/Modules/_csv.c b/Modules/_csv.c index c02ee384b2c..443309c59bb 100644 --- a/Modules/_csv.c +++ b/Modules/_csv.c @@ -207,7 +207,7 @@ _set_char(const char *name, Py_UCS4 *target, PyObject *src, Py_UCS4 dflt) *target = '\0'; if (src != Py_None) { Py_ssize_t len; - len = PyUnicode_GetSize(src); + len = PyUnicode_GetLength(src); if (len > 1) { PyErr_Format(PyExc_TypeError, "\"%s\" must be an 1-character string", diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c index 316e1d72fdc..b38423376a3 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -1080,7 +1080,7 @@ make_Zreplacement(PyObject *object, PyObject *tzinfoarg) PyObject *tzinfo = get_tzinfo_member(object); PyObject *Zreplacement = PyUnicode_FromStringAndSize(NULL, 0); _Py_IDENTIFIER(replace); - + if (Zreplacement == NULL) return NULL; if (tzinfo == Py_None || tzinfo == NULL) @@ -2673,7 +2673,7 @@ date_format(PyDateTime_Date *self, PyObject *args) return NULL; /* if the format is zero length, return str(self) */ - if (PyUnicode_GetSize(format) == 0) + if (PyUnicode_GetLength(format) == 0) return PyObject_Str((PyObject *)self); return _PyObject_CallMethodId((PyObject *)self, &PyId_strftime, "O", format); diff --git a/Modules/_gestalt.c b/Modules/_gestalt.c index a45780fe795..cd3068334a7 100644 --- a/Modules/_gestalt.c +++ b/Modules/_gestalt.c @@ -33,7 +33,7 @@ static int convert_to_OSType(PyObject *v, OSType *pr) { uint32_t tmp; - if (!PyUnicode_Check(v) || PyUnicode_GetSize(v) != 4) { + if (!PyUnicode_Check(v) || PyUnicode_GetLength(v) != 4) { PyErr_SetString(PyExc_TypeError, "OSType arg must be string of 4 chars"); return 0; diff --git a/Modules/_io/stringio.c b/Modules/_io/stringio.c index 774999015c9..c4794c9474e 100644 --- a/Modules/_io/stringio.c +++ b/Modules/_io/stringio.c @@ -730,7 +730,7 @@ stringio_init(stringio *self, PyObject *args, PyObject *kwds) and copy it */ self->string_size = 0; if (value && value != Py_None) - value_len = PyUnicode_GetSize(value); + value_len = PyUnicode_GetLength(value); else value_len = 0; if (value_len > 0) { diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c index 91a389195e4..07dad3a8ba1 100644 --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -2144,7 +2144,7 @@ textiowrapper_seek(textio *self, PyObject *args) textiowrapper_set_decoded_chars(self, decoded); /* Skip chars_to_skip of the decoded characters. */ - if (PyUnicode_GetSize(self->decoded_chars) < cookie.chars_to_skip) { + if (PyUnicode_GetLength(self->decoded_chars) < cookie.chars_to_skip) { PyErr_SetString(PyExc_IOError, "can't restore logical file position"); goto fail; } @@ -2208,7 +2208,7 @@ textiowrapper_tell(textio *self, PyObject *args) goto fail; if (self->decoder == NULL || self->snapshot == NULL) { - assert (self->decoded_chars == NULL || PyUnicode_GetSize(self->decoded_chars) == 0); + assert (self->decoded_chars == NULL || PyUnicode_GetLength(self->decoded_chars) == 0); return posobj; } diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index 7438a70332a..a89798a167b 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -2941,7 +2941,7 @@ _PyBytes_FormatLong(PyObject *val, int flags, int prec, int type, PyErr_BadInternalCall(); return NULL; } - llen = PyUnicode_GetSize(result); + llen = PyUnicode_GetLength(result); if (llen > INT_MAX) { PyErr_SetString(PyExc_ValueError, "string too large in _PyBytes_FormatLong"); diff --git a/Objects/exceptions.c b/Objects/exceptions.c index a1b79a86bc4..37b78757736 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -1273,7 +1273,7 @@ PyUnicodeEncodeError_GetStart(PyObject *exc, Py_ssize_t *start) if (!obj) return -1; *start = ((PyUnicodeErrorObject *)exc)->start; - size = PyUnicode_GET_SIZE(obj); + size = PyUnicode_GET_LENGTH(obj); if (*start<0) *start = 0; /*XXX check for values <0*/ if (*start>=size) @@ -1341,7 +1341,7 @@ PyUnicodeEncodeError_GetEnd(PyObject *exc, Py_ssize_t *end) if (!obj) return -1; *end = ((PyUnicodeErrorObject *)exc)->end; - size = PyUnicode_GET_SIZE(obj); + size = PyUnicode_GET_LENGTH(obj); if (*end<1) *end = 1; if (*end>size) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 1e44357c2fb..6798ef81452 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -4784,7 +4784,7 @@ _PyUnicode_AsUTF8String(PyObject *unicode, const char *errors) if (PyBytes_Check(rep)) repsize = PyBytes_GET_SIZE(rep); else - repsize = PyUnicode_GET_SIZE(rep); + repsize = PyUnicode_GET_LENGTH(rep); if (repsize > 4) { Py_ssize_t offset; @@ -8187,7 +8187,7 @@ charmap_encoding_error( Py_DECREF(repunicode); return -1; } - repsize = PyUnicode_GET_SIZE(repunicode); + repsize = PyUnicode_GET_LENGTH(repunicode); data = PyUnicode_DATA(repunicode); kind = PyUnicode_KIND(repunicode); for (index = 0; index < repsize; index++) { diff --git a/PC/import_nt.c b/PC/import_nt.c index dfbf0548103..b9b36dca5e2 100644 --- a/PC/import_nt.c +++ b/PC/import_nt.c @@ -86,12 +86,11 @@ _PyWin_FindRegisteredModule(PyObject *moduleName, suffix = PyUnicode_FromString(fdp->suffix); if (suffix == NULL) return NULL; - wsuffix = PyUnicode_AsUnicode(suffix); + wsuffix = PyUnicode_AsUnicodeAndSize(suffix, &extLen); if (wsuffix == NULL) { Py_DECREF(suffix); return NULL; } - extLen = PyUnicode_GET_SIZE(suffix); if ((Py_ssize_t)modNameSize > extLen && _wcsnicmp(pathBuf + ((Py_ssize_t)modNameSize-extLen-1), wsuffix, diff --git a/Python/_warnings.c b/Python/_warnings.c index 2e5b0dd4e28..a494dd9a3c7 100644 --- a/Python/_warnings.c +++ b/Python/_warnings.c @@ -203,13 +203,13 @@ normalize_module(PyObject *filename) mod_str = _PyUnicode_AsString(filename); if (mod_str == NULL) - return NULL; - len = PyUnicode_GetSize(filename); + return NULL; + len = PyUnicode_GetLength(filename); if (len < 0) return NULL; if (len >= 3 && strncmp(mod_str + (len - 3), ".py", 3) == 0) { - module = PyUnicode_FromStringAndSize(mod_str, len-3); + module = PyUnicode_Substring(filename, 0, len-3); } else { module = filename; @@ -506,7 +506,7 @@ setup_context(Py_ssize_t stack_level, PyObject **filename, int *lineno, if (PyUnicode_READY(*filename)) goto handle_error; - len = PyUnicode_GetSize(*filename); + len = PyUnicode_GetLength(*filename); kind = PyUnicode_KIND(*filename); data = PyUnicode_DATA(*filename); @@ -690,7 +690,7 @@ warnings_warn_explicit(PyObject *self, PyObject *args, PyObject *kwds) } /* Split the source into lines. */ - source_list = PyObject_CallMethodObjArgs(source, + source_list = PyObject_CallMethodObjArgs(source, PyId_splitlines.object, NULL); Py_DECREF(source);