diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2007-07-21 18:47:48 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2007-07-21 18:47:48 (GMT) |
| commit | 5d7428b8ce0ffc79b24b05df2b3d2865db037902 (patch) | |
| tree | c673d91d8fe112d194cb9bbf45006b8b35838965 /Objects/stringobject.c | |
| parent | 9f2e346911988cda95fec7c901e8d10d34fa9563 (diff) | |
| download | cpython-5d7428b8ce0ffc79b24b05df2b3d2865db037902.zip cpython-5d7428b8ce0ffc79b24b05df2b3d2865db037902.tar.gz cpython-5d7428b8ce0ffc79b24b05df2b3d2865db037902.tar.bz2 | |
Fix merge breakage.
Diffstat (limited to 'Objects/stringobject.c')
| -rw-r--r-- | Objects/stringobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/stringobject.c b/Objects/stringobject.c index 6156b2f..68dfd35 100644 --- a/Objects/stringobject.c +++ b/Objects/stringobject.c @@ -835,7 +835,7 @@ PyString_Repr(PyObject *obj, int smartquotes) static const char *hexdigits = "0123456789abcdef"; register PyStringObject* op = (PyStringObject*) obj; Py_ssize_t length = PyString_GET_SIZE(op); - size_t newsize = 3 + 4 * op->ob_size; + size_t newsize = 3 + 4 * Py_Size(op); PyObject *v; if (newsize > PY_SSIZE_T_MAX || newsize / 4 != Py_Size(op)) { PyErr_SetString(PyExc_OverflowError, |