Clean up PyString_Size().

Removed string_getsize(), since it was only useful when
PyString_AsStringAndSize was able to convert an (ascii)
Unicode object to a C string.

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 0125a99c7de0be251cb96cccfc65a591f21b821b..011fc323abde7d010d1b33063e3ba08a2e122306 100644 (file)
--- 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