diff options
Diffstat (limited to 'Objects/stringobject.c')
| -rw-r--r-- | Objects/stringobject.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/Objects/stringobject.c b/Objects/stringobject.c index 0125a99c7d..011fc323ab 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -494,25 +494,18 @@ PyObject *PyString_DecodeEscape(const char *s, /* -------------------------------------------------------------------- */ /* object api */ -static Py_ssize_t -string_getsize(register PyObject *op) -{ - char *s; - Py_ssize_t len; - if (PyString_AsStringAndSize(op, &s, &len)) - return -1; - return len; -} - Py_ssize_t PyString_Size(register PyObject *op) { - if (!PyString_Check(op)) - return string_getsize(op); + if (!PyString_Check(op)) { + PyErr_Format(PyExc_TypeError, + "expected bytes, %.200s found", Py_TYPE(op)->tp_name); + return -1; + } return Py_SIZE(op); } -/*const*/ char * +char * PyString_AsString(register PyObject *op) { if (!PyString_Check(op)) { @@ -520,7 +513,7 @@ PyString_AsString(register PyObject *op) "expected bytes, %.200s found", Py_TYPE(op)->tp_name); return NULL; } - return ((PyStringObject *)op) -> ob_sval; + return ((PyStringObject *)op)->ob_sval; } int |